Merge remote-tracking branch 'origin/master'

Author: nnixaa

src/app/theme/components/baContentTop/baContentTop.scss

@@ -32,7 +32,7 @@ h1.al-title {
     }
 
     &.breadcrumb-item.active {
-      color: $default;
+      color: $default-text;
     }
   }
 }

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) {

src/app/theme/components/baMenu/components/baMenuItem/baMenuItem.html

@@ -8,7 +8,7 @@
     <i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span>
   </a>
 
-  <a *ngIf="menuItem.children" (mouseenter)="onHoverItem($event, item)" (click)="onToggleSubMenu($event, menuItem)" class="al-sidebar-list-link">
+  <a *ngIf="menuItem.children" (mouseenter)="onHoverItem($event, item)" href (click)="onToggleSubMenu($event, menuItem)" class="al-sidebar-list-link">
     <i *ngIf="menuItem.icon" class="{{ menuItem.icon }}"></i><span>{{ menuItem.title }}</span>
     <b class="fa fa-angle-down" [ngClass]="{'fa-angle-up': menuItem.expanded}"></b>
   </a>

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) {

src/app/theme/components/baPageTop/baPageTop.html

@@ -1,7 +1,7 @@
 <div class="page-top clearfix" baScrollPosition maxHeight="50" (scrollChange)="scrolledChanged($event)"
      [ngClass]="{scrolled: isScrolled}">
   <a routerLink="/pages/dashboard" class="al-logo clearfix"><span>ng2-</span>admin</a>
-  <a (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></a>
+  <a href (click)="toggleMenu()" class="collapse-menu-link ion-navicon"></a>
 
   <div class="search">
     <i class="ion-ios-search-strong" ng-click="startSearch()"></i>

src/app/theme/components/baSidebar/baSidebar.scss

@@ -1,6 +1,6 @@
 @import '../../sass/conf/conf';
 
-$sidebar-width: 180px;
+$sidebar-scroll-width: 4px;
 $angle-left: "\f100";
 $angle-right: "\f101";
 
@@ -113,8 +113,8 @@ a.al-sidebar-list-link {
 
 .slimScrollBar, .slimScrollRail {
   border-radius: 0px !important;
-  width: 4px !important;
-  left: 176px;
+  width: $sidebar-scroll-width !important;
+  left: $sidebar-width - $sidebar-scroll-width;
 }
 
 @mixin layout-collapsed() {
@@ -170,11 +170,11 @@ a.al-sidebar-list-link {
 }
 
 .sidebar-hover-elem{
-  width: 4px;
+  width: $sidebar-scroll-width;
   background: $primary;
   position: absolute;
   top: -150px;
-  left: 176px;
+  left: $sidebar-width - $sidebar-scroll-width;
   transition: all 0.5s ease;
   transition-property: top, height;
   height: 42px;

src/app/theme/sass/_layout.scss

@@ -1,4 +1,6 @@
-$left-space: 180px;
+@import 'conf/conf';
+
+$left-space: $sidebar-width;
 
 @include scrollbars(.5em, #d9d9d9, rgba(0, 0, 0, 0));
 
@@ -66,7 +68,7 @@ a {
 
 .al-footer {
   height: 34px;
-  padding: 0 18px 0 200px;
+  padding: 0 18px 0 ($left-space + 20px);
   width: 100%;
   position: absolute;
   display: block;

src/app/theme/sass/conf/_variables.scss

@@ -10,6 +10,7 @@ $resXXS: 435px;
 $resMin: 320px;
 
 $top-height: 66px;
+$sidebar-width: 180px;
 
 $small-card-height: 114px;
 $xsmall-card-height: 187px;