refactor(global)

src/app/theme/components/sidebar/SidebarCtrl.js

@@ -20,7 +20,7 @@
         menu.expanded = menu.expanded || menu.selected;
         if (menu.subMenu) {
           $.each(menu.subMenu, function (subIndex, subMenu) {
-            subMenu.selected = ('#' + $location.$$url).indexOf(subMenu.root) == 0;
+            subMenu.selected = (('#' + $location.$$url).indexOf(subMenu.root) == 0) && !subMenu.disabled;
           });
         }
       });

src/app/theme/components/sidebar/sidebar.html

@@ -30,7 +30,7 @@
                 subSubitem.title }}</a>
             </li>
           </ul>
-          <a  ng-mouseenter="hoverItem($event, item)" target="{{subitem.root[0]=='#' ? '_self' : '_blank'}}" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
+          <a  ng-mouseenter="hoverItem($event, item)" target="{{subitem.blank ? '_blank' : '_self'}}" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
         </li>
       </ul>
     </li>

src/app/theme/components/sidebar/sidebar.service.js

@@ -11,28 +11,33 @@
         icon: 'ion-document',
         subMenu: [{
             title: 'Sign In',
-            root: 'auth.html'
+            root: 'auth.html',
+            blank: true
           }, {
             title: 'Sign Up',
-            root: 'reg.html'
+            root: 'reg.html',
+            blank: true
           }, {
             title: 'User Profile',
             root: '#/profile'
           }, {
             title: '404 Page',
-            root: '404.html'
+            root: '404.html',
+            blank: true
           }]
       }, {
         title: 'Menu Level 1',
         icon: 'ion-ios-more',
         subMenu: [{
             title: 'Menu Level 1.1',
-            root: '#'
+            root: '#',
+            disabled: true
           }, {
             title: 'Menu Level 1.2',
             subMenu: [{
               title: 'Menu Level 1.2.1',
-              root: '#'
+              root: '#',
+              disabled: true
             }]
           }]
       }];

src/sass/app/_buttonsPage.scss

@@ -85,6 +85,7 @@ $btn-icon-size: 34px;
     line-height: 1;
     font-size: 14px;
     margin-bottom: 10px;
+    margin-top: 10px;
   }
   .row + .row {
     margin-top: 30px;

src/sass/app/_form.scss

@@ -124,7 +124,7 @@ textarea.form-control {
 }
 
 .bootstrap-switch {
-  border-radius: 0;
+  border-radius: 5px;
   border: 1px solid $default;
   transition: border-color ease-in-out .7s, box-shadow ease-in-out .7s;
   &:focus {
@@ -446,7 +446,7 @@ label.custom-input-danger {
 .bootstrap-select {
   .btn-default {
     background: transparent;
-    color: #555555;
+    color: $default;
     &:focus {
       background: #ffffff;
       box-shadow: none;
@@ -459,13 +459,11 @@ label.custom-input-danger {
     }
   }
   &.open {
-    .btn-default + .dropdown-menu {
-      border-top: 1px solid $disabled;
-    }
     .btn-default.dropdown-toggle {
       box-shadow: none;
       background-color: #ffffff;
       border-color: $default;
+      color: $default;
     }
     .dropdown-menu {
       border-left: 1px solid $default;
@@ -483,9 +481,15 @@ label.custom-input-danger {
       border-top: none;
     }
   }
+  &.with-search.open{
+    .btn-default.btn{
+      background-color: rgba(0, 0, 0, 0.2);
+      border-color: 1px solid $default;
+    }
+  }
   &.with-search.open .btn-default + .dropdown-menu {
     .bs-searchbox .form-control {
-      background-color: rgba(0, 0, 0, 0.5);
+      background-color: rgba(0, 0, 0, 0.35);
     }
     .no-results {
       color: $default-text;

src/sass/app/_profile.scss

@@ -132,10 +132,11 @@ $snPadding: 8px;
 a.sn-link {
   transition: none;
   display: block;
-  background-color: #fff;
+  border-radius: 5px;
+  background-color: rgba(0, 0, 0, .15);
   padding: $snPadding;
-  color: $default-text;
-  border: 1px solid $border;
+  color: $default;
+  border: 1px solid transparent;
   margin-bottom: 23px;
   width: 100%;
   position: relative;
@@ -147,7 +148,7 @@ a.sn-link {
     width: auto;
     font-size: 17px;
     margin-right: 8px;
-    background-color: #666666;
+    background-color: rgba(0,0,0,.15);
     color: #fff;
   }
   span {
@@ -164,7 +165,7 @@ a.sn-link {
     border-width: 2px;
     padding: $snPadding - 1;
     span {
-      color: $snColor;
+      color: $default;
     }
     i {
       background: $snColor;

src/sass/theme/_buttons.scss

@@ -37,7 +37,7 @@ $hover: 24;
   }
 }
 
-.open > .dropdown-toggle {
+.open > .btn.dropdown-toggle {
   &.btn.btn-primary {
     @include styleButton($primary, $primary - $hover);
     background-color: $primary-dark;
@@ -45,6 +45,10 @@ $hover: 24;
   }
   &.btn-default {
     @include styleButton(transparent, $default);
+    &:focus, &:active:hover, &.active:hover, &:hover{
+      background-color: rgba(0, 0, 0, 0.2);
+      color: $default;
+    }
   }
   &.btn-success {
     @include styleButton($success, $success - $hover);
@@ -116,6 +120,18 @@ button.btn.btn-danger {
   }
 }
 
+
+button.btn.btn-inverse {
+  @include buttonColor($help-text, $help-text);
+  color: $default;
+  &:active, &:target, &:hover {
+    background-color: $help-text;
+    color: $default;
+  }
+}
+
+
+
 .btn-with-icon {
   i {
     margin-right: 10px;