diff --git a/src/app/theme/components/baContentTop/baContentTop.scss b/src/app/theme/components/baContentTop/baContentTop.scss index 0184ad3c..520bb903 100644 --- a/src/app/theme/components/baContentTop/baContentTop.scss +++ b/src/app/theme/components/baContentTop/baContentTop.scss @@ -32,7 +32,7 @@ h1.al-title { } &.breadcrumb-item.active { - color: $default; + color: $default-text; } } } diff --git a/src/app/theme/components/baMenu/baMenu.service.ts b/src/app/theme/components/baMenu/baMenu.service.ts index 5595b2d5..20787e5d 100644 --- a/src/app/theme/components/baMenu/baMenu.service.ts +++ b/src/app/theme/components/baMenu/baMenu.service.ts @@ -80,7 +80,7 @@ export class BaMenuService { item.route.paths = item.route.path; } else { item.route.paths = parent && parent.route && parent.route.paths ? parent.route.paths.slice(0) : ['/']; - item.route.paths.push(item.route.path); + if (!!item.route.path) item.route.paths.push(item.route.path); } if (object.children && object.children.length > 0) { diff --git a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html index 737aecc2..b741dd9b 100644 --- a/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html +++ b/src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html @@ -8,7 +8,7 @@ {{ menuItem.title }} - + {{ menuItem.title }} diff --git a/src/app/theme/components/baPageTop/baPageTop.component.ts b/src/app/theme/components/baPageTop/baPageTop.component.ts index 82f690cd..e20d38a7 100644 --- a/src/app/theme/components/baPageTop/baPageTop.component.ts +++ b/src/app/theme/components/baPageTop/baPageTop.component.ts @@ -22,6 +22,7 @@ export class BaPageTop { public toggleMenu() { this.isMenuCollapsed = !this.isMenuCollapsed; this._state.notifyDataChanged('menu.isCollapsed', this.isMenuCollapsed); + return false; } public scrolledChanged(isScrolled) { diff --git a/src/app/theme/components/baPageTop/baPageTop.html b/src/app/theme/components/baPageTop/baPageTop.html index c899c7ca..1c6b660d 100644 --- a/src/app/theme/components/baPageTop/baPageTop.html +++ b/src/app/theme/components/baPageTop/baPageTop.html @@ -1,7 +1,7 @@
- +