Browse Source

fixed accent link color overrides on sidebar and btn-app

REJack 5 years ago
parent
commit
4480db7f27

+ 30 - 13
build/scss/mixins/_accent.scss

@@ -11,7 +11,7 @@
     $pagination-active-border-color: $color;
 
     .btn-link,
-    a:not(.dropdown-item  ) {
+    a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link) {
       color: $link-color;
 
       @include hover {
@@ -19,9 +19,11 @@
       }
     }
 
-    .dropdown-item.active {
-      background: $color;
-      color: color-yiq($color);
+    .dropdown-item {
+      &.active {
+        background: $color;
+        color: color-yiq($color);
+      }
     }
 
     .custom-control-input:checked ~ .custom-control-label {
@@ -42,15 +44,6 @@
     .custom-file-input:focus ~ .custom-file-label {
       border-color: lighten($color, 25%);
     }
-
-    [class*="sidebar-light-"],
-    &[class*="sidebar-dark-"] {
-        .nav-sidebar .nav-treeview > .nav-item > {
-        .nav-link:not(.active):hover {
-          color: $color;
-        }
-      }
-    }
     
     .page-item {
       &.active .page-link {
@@ -63,6 +56,30 @@
         border-color: $pagination-disabled-border-color;
       }
     }
+
+    [class*="sidebar-dark-"] {
+      .sidebar {
+        a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link) {
+          color: $sidebar-dark-color;
+      
+          @include hover {
+            color: $sidebar-dark-hover-color;
+          }
+        }
+      }
+    }
+
+    [class*="sidebar-light-"] {
+      .sidebar {
+        a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link) {
+          color: $sidebar-light-color;
+
+          @include hover {
+            color: $sidebar-light-hover-color;
+          }
+        }
+      }
+    }
   }
 }
 

File diff suppressed because it is too large
+ 416 - 140
dist/css/adminlte.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.min.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.min.css.map


Some files were not shown because too many files changed in this diff