Browse Source

fixed accent color override with dropdown menus

REJack 5 years ago
parent
commit
1ea675c50d

+ 6 - 1
build/scss/mixins/_accent.scss

@@ -11,7 +11,7 @@
     $pagination-active-border-color: $color;
 
     .btn-link,
-    a {
+    a:not(.dropdown-item  ) {
       color: $link-color;
 
       @include hover {
@@ -19,6 +19,11 @@
       }
     }
 
+    .dropdown-item.active {
+      background: $color;
+      color: color-yiq($color);
+    }
+
     .custom-control-input:checked ~ .custom-control-label {
       &::before {
         background: $color;

+ 189 - 54
dist/css/adminlte.css

@@ -28765,15 +28765,20 @@ a.text-muted:hover {
 }
 
 .accent-primary .btn-link,
-.accent-primary a {
+.accent-primary a:not(.dropdown-item) {
   color: #007bff;
 }
 
 .accent-primary .btn-link:hover,
-.accent-primary a:hover {
+.accent-primary a:not(.dropdown-item):hover {
   color: #0056b3;
 }
 
+.accent-primary .dropdown-item.active {
+  background: #007bff;
+  color: #ffffff;
+}
+
 .accent-primary .custom-control-input:checked ~ .custom-control-label::before {
   background: #007bff;
   border-color: #004a99;
@@ -28805,15 +28810,20 @@ a.text-muted:hover {
 }
 
 .accent-secondary .btn-link,
-.accent-secondary a {
+.accent-secondary a:not(.dropdown-item) {
   color: #6c757d;
 }
 
 .accent-secondary .btn-link:hover,
-.accent-secondary a:hover {
+.accent-secondary a:not(.dropdown-item):hover {
   color: #494f54;
 }
 
+.accent-secondary .dropdown-item.active {
+  background: #6c757d;
+  color: #ffffff;
+}
+
 .accent-secondary .custom-control-input:checked ~ .custom-control-label::before {
   background: #6c757d;
   border-color: #3d4246;
@@ -28845,15 +28855,20 @@ a.text-muted:hover {
 }
 
 .accent-success .btn-link,
-.accent-success a {
+.accent-success a:not(.dropdown-item) {
   color: #28a745;
 }
 
 .accent-success .btn-link:hover,
-.accent-success a:hover {
+.accent-success a:not(.dropdown-item):hover {
   color: #19692c;
 }
 
+.accent-success .dropdown-item.active {
+  background: #28a745;
+  color: #ffffff;
+}
+
 .accent-success .custom-control-input:checked ~ .custom-control-label::before {
   background: #28a745;
   border-color: #145523;
@@ -28885,15 +28900,20 @@ a.text-muted:hover {
 }
 
 .accent-info .btn-link,
-.accent-info a {
+.accent-info a:not(.dropdown-item) {
   color: #17a2b8;
 }
 
 .accent-info .btn-link:hover,
-.accent-info a:hover {
+.accent-info a:not(.dropdown-item):hover {
   color: #0f6674;
 }
 
+.accent-info .dropdown-item.active {
+  background: #17a2b8;
+  color: #ffffff;
+}
+
 .accent-info .custom-control-input:checked ~ .custom-control-label::before {
   background: #17a2b8;
   border-color: #0c525d;
@@ -28925,15 +28945,20 @@ a.text-muted:hover {
 }
 
 .accent-warning .btn-link,
-.accent-warning a {
+.accent-warning a:not(.dropdown-item) {
   color: #ffc107;
 }
 
 .accent-warning .btn-link:hover,
-.accent-warning a:hover {
+.accent-warning a:not(.dropdown-item):hover {
   color: #ba8b00;
 }
 
+.accent-warning .dropdown-item.active {
+  background: #ffc107;
+  color: #1F2D3D;
+}
+
 .accent-warning .custom-control-input:checked ~ .custom-control-label::before {
   background: #ffc107;
   border-color: #a07800;
@@ -28965,15 +28990,20 @@ a.text-muted:hover {
 }
 
 .accent-danger .btn-link,
-.accent-danger a {
+.accent-danger a:not(.dropdown-item) {
   color: #dc3545;
 }
 
 .accent-danger .btn-link:hover,
-.accent-danger a:hover {
+.accent-danger a:not(.dropdown-item):hover {
   color: #a71d2a;
 }
 
+.accent-danger .dropdown-item.active {
+  background: #dc3545;
+  color: #ffffff;
+}
+
 .accent-danger .custom-control-input:checked ~ .custom-control-label::before {
   background: #dc3545;
   border-color: #921925;
@@ -29005,15 +29035,20 @@ a.text-muted:hover {
 }
 
 .accent-light .btn-link,
-.accent-light a {
+.accent-light a:not(.dropdown-item) {
   color: #f8f9fa;
 }
 
 .accent-light .btn-link:hover,
-.accent-light a:hover {
+.accent-light a:not(.dropdown-item):hover {
   color: #cbd3da;
 }
 
+.accent-light .dropdown-item.active {
+  background: #f8f9fa;
+  color: #1F2D3D;
+}
+
 .accent-light .custom-control-input:checked ~ .custom-control-label::before {
   background: #f8f9fa;
   border-color: #bdc6d0;
@@ -29045,15 +29080,20 @@ a.text-muted:hover {
 }
 
 .accent-dark .btn-link,
-.accent-dark a {
+.accent-dark a:not(.dropdown-item) {
   color: #343a40;
 }
 
 .accent-dark .btn-link:hover,
-.accent-dark a:hover {
+.accent-dark a:not(.dropdown-item):hover {
   color: #121416;
 }
 
+.accent-dark .dropdown-item.active {
+  background: #343a40;
+  color: #ffffff;
+}
+
 .accent-dark .custom-control-input:checked ~ .custom-control-label::before {
   background: #343a40;
   border-color: #060708;
@@ -29085,15 +29125,20 @@ a.text-muted:hover {
 }
 
 .accent-lightblue .btn-link,
-.accent-lightblue a {
+.accent-lightblue a:not(.dropdown-item) {
   color: #3c8dbc;
 }
 
 .accent-lightblue .btn-link:hover,
-.accent-lightblue a:hover {
+.accent-lightblue a:not(.dropdown-item):hover {
   color: #296282;
 }
 
+.accent-lightblue .dropdown-item.active {
+  background: #3c8dbc;
+  color: #ffffff;
+}
+
 .accent-lightblue .custom-control-input:checked ~ .custom-control-label::before {
   background: #3c8dbc;
   border-color: #23536f;
@@ -29125,15 +29170,20 @@ a.text-muted:hover {
 }
 
 .accent-navy .btn-link,
-.accent-navy a {
+.accent-navy a:not(.dropdown-item) {
   color: #001f3f;
 }
 
 .accent-navy .btn-link:hover,
-.accent-navy a:hover {
+.accent-navy a:not(.dropdown-item):hover {
   color: black;
 }
 
+.accent-navy .dropdown-item.active {
+  background: #001f3f;
+  color: #ffffff;
+}
+
 .accent-navy .custom-control-input:checked ~ .custom-control-label::before {
   background: #001f3f;
   border-color: black;
@@ -29165,15 +29215,20 @@ a.text-muted:hover {
 }
 
 .accent-olive .btn-link,
-.accent-olive a {
+.accent-olive a:not(.dropdown-item) {
   color: #3d9970;
 }
 
 .accent-olive .btn-link:hover,
-.accent-olive a:hover {
+.accent-olive a:not(.dropdown-item):hover {
   color: #276248;
 }
 
+.accent-olive .dropdown-item.active {
+  background: #3d9970;
+  color: #ffffff;
+}
+
 .accent-olive .custom-control-input:checked ~ .custom-control-label::before {
   background: #3d9970;
   border-color: #20503b;
@@ -29205,15 +29260,20 @@ a.text-muted:hover {
 }
 
 .accent-lime .btn-link,
-.accent-lime a {
+.accent-lime a:not(.dropdown-item) {
   color: #01ff70;
 }
 
 .accent-lime .btn-link:hover,
-.accent-lime a:hover {
+.accent-lime a:not(.dropdown-item):hover {
   color: #00b44e;
 }
 
+.accent-lime .dropdown-item.active {
+  background: #01ff70;
+  color: #1F2D3D;
+}
+
 .accent-lime .custom-control-input:checked ~ .custom-control-label::before {
   background: #01ff70;
   border-color: #009a43;
@@ -29245,15 +29305,20 @@ a.text-muted:hover {
 }
 
 .accent-fuchsia .btn-link,
-.accent-fuchsia a {
+.accent-fuchsia a:not(.dropdown-item) {
   color: #f012be;
 }
 
 .accent-fuchsia .btn-link:hover,
-.accent-fuchsia a:hover {
+.accent-fuchsia a:not(.dropdown-item):hover {
   color: #ab0b87;
 }
 
+.accent-fuchsia .dropdown-item.active {
+  background: #f012be;
+  color: #ffffff;
+}
+
 .accent-fuchsia .custom-control-input:checked ~ .custom-control-label::before {
   background: #f012be;
   border-color: #930974;
@@ -29285,15 +29350,20 @@ a.text-muted:hover {
 }
 
 .accent-maroon .btn-link,
-.accent-maroon a {
+.accent-maroon a:not(.dropdown-item) {
   color: #d81b60;
 }
 
 .accent-maroon .btn-link:hover,
-.accent-maroon a:hover {
+.accent-maroon a:not(.dropdown-item):hover {
   color: #941342;
 }
 
+.accent-maroon .dropdown-item.active {
+  background: #d81b60;
+  color: #ffffff;
+}
+
 .accent-maroon .custom-control-input:checked ~ .custom-control-label::before {
   background: #d81b60;
   border-color: #7d1038;
@@ -29325,15 +29395,20 @@ a.text-muted:hover {
 }
 
 .accent-blue .btn-link,
-.accent-blue a {
+.accent-blue a:not(.dropdown-item) {
   color: #007bff;
 }
 
 .accent-blue .btn-link:hover,
-.accent-blue a:hover {
+.accent-blue a:not(.dropdown-item):hover {
   color: #0056b3;
 }
 
+.accent-blue .dropdown-item.active {
+  background: #007bff;
+  color: #ffffff;
+}
+
 .accent-blue .custom-control-input:checked ~ .custom-control-label::before {
   background: #007bff;
   border-color: #004a99;
@@ -29365,15 +29440,20 @@ a.text-muted:hover {
 }
 
 .accent-indigo .btn-link,
-.accent-indigo a {
+.accent-indigo a:not(.dropdown-item) {
   color: #6610f2;
 }
 
 .accent-indigo .btn-link:hover,
-.accent-indigo a:hover {
+.accent-indigo a:not(.dropdown-item):hover {
   color: #4709ac;
 }
 
+.accent-indigo .dropdown-item.active {
+  background: #6610f2;
+  color: #ffffff;
+}
+
 .accent-indigo .custom-control-input:checked ~ .custom-control-label::before {
   background: #6610f2;
   border-color: #3d0894;
@@ -29405,15 +29485,20 @@ a.text-muted:hover {
 }
 
 .accent-purple .btn-link,
-.accent-purple a {
+.accent-purple a:not(.dropdown-item) {
   color: #6f42c1;
 }
 
 .accent-purple .btn-link:hover,
-.accent-purple a:hover {
+.accent-purple a:not(.dropdown-item):hover {
   color: #4e2d89;
 }
 
+.accent-purple .dropdown-item.active {
+  background: #6f42c1;
+  color: #ffffff;
+}
+
 .accent-purple .custom-control-input:checked ~ .custom-control-label::before {
   background: #6f42c1;
   border-color: #432776;
@@ -29445,15 +29530,20 @@ a.text-muted:hover {
 }
 
 .accent-pink .btn-link,
-.accent-pink a {
+.accent-pink a:not(.dropdown-item) {
   color: #e83e8c;
 }
 
 .accent-pink .btn-link:hover,
-.accent-pink a:hover {
+.accent-pink a:not(.dropdown-item):hover {
   color: #c21766;
 }
 
+.accent-pink .dropdown-item.active {
+  background: #e83e8c;
+  color: #ffffff;
+}
+
 .accent-pink .custom-control-input:checked ~ .custom-control-label::before {
   background: #e83e8c;
   border-color: #ac145a;
@@ -29485,15 +29575,20 @@ a.text-muted:hover {
 }
 
 .accent-red .btn-link,
-.accent-red a {
+.accent-red a:not(.dropdown-item) {
   color: #dc3545;
 }
 
 .accent-red .btn-link:hover,
-.accent-red a:hover {
+.accent-red a:not(.dropdown-item):hover {
   color: #a71d2a;
 }
 
+.accent-red .dropdown-item.active {
+  background: #dc3545;
+  color: #ffffff;
+}
+
 .accent-red .custom-control-input:checked ~ .custom-control-label::before {
   background: #dc3545;
   border-color: #921925;
@@ -29525,15 +29620,20 @@ a.text-muted:hover {
 }
 
 .accent-orange .btn-link,
-.accent-orange a {
+.accent-orange a:not(.dropdown-item) {
   color: #fd7e14;
 }
 
 .accent-orange .btn-link:hover,
-.accent-orange a:hover {
+.accent-orange a:not(.dropdown-item):hover {
   color: #c35a02;
 }
 
+.accent-orange .dropdown-item.active {
+  background: #fd7e14;
+  color: #1F2D3D;
+}
+
 .accent-orange .custom-control-input:checked ~ .custom-control-label::before {
   background: #fd7e14;
   border-color: #aa4e01;
@@ -29565,15 +29665,20 @@ a.text-muted:hover {
 }
 
 .accent-yellow .btn-link,
-.accent-yellow a {
+.accent-yellow a:not(.dropdown-item) {
   color: #ffc107;
 }
 
 .accent-yellow .btn-link:hover,
-.accent-yellow a:hover {
+.accent-yellow a:not(.dropdown-item):hover {
   color: #ba8b00;
 }
 
+.accent-yellow .dropdown-item.active {
+  background: #ffc107;
+  color: #1F2D3D;
+}
+
 .accent-yellow .custom-control-input:checked ~ .custom-control-label::before {
   background: #ffc107;
   border-color: #a07800;
@@ -29605,15 +29710,20 @@ a.text-muted:hover {
 }
 
 .accent-green .btn-link,
-.accent-green a {
+.accent-green a:not(.dropdown-item) {
   color: #28a745;
 }
 
 .accent-green .btn-link:hover,
-.accent-green a:hover {
+.accent-green a:not(.dropdown-item):hover {
   color: #19692c;
 }
 
+.accent-green .dropdown-item.active {
+  background: #28a745;
+  color: #ffffff;
+}
+
 .accent-green .custom-control-input:checked ~ .custom-control-label::before {
   background: #28a745;
   border-color: #145523;
@@ -29645,15 +29755,20 @@ a.text-muted:hover {
 }
 
 .accent-teal .btn-link,
-.accent-teal a {
+.accent-teal a:not(.dropdown-item) {
   color: #20c997;
 }
 
 .accent-teal .btn-link:hover,
-.accent-teal a:hover {
+.accent-teal a:not(.dropdown-item):hover {
   color: #158765;
 }
 
+.accent-teal .dropdown-item.active {
+  background: #20c997;
+  color: #ffffff;
+}
+
 .accent-teal .custom-control-input:checked ~ .custom-control-label::before {
   background: #20c997;
   border-color: #127155;
@@ -29685,15 +29800,20 @@ a.text-muted:hover {
 }
 
 .accent-cyan .btn-link,
-.accent-cyan a {
+.accent-cyan a:not(.dropdown-item) {
   color: #17a2b8;
 }
 
 .accent-cyan .btn-link:hover,
-.accent-cyan a:hover {
+.accent-cyan a:not(.dropdown-item):hover {
   color: #0f6674;
 }
 
+.accent-cyan .dropdown-item.active {
+  background: #17a2b8;
+  color: #ffffff;
+}
+
 .accent-cyan .custom-control-input:checked ~ .custom-control-label::before {
   background: #17a2b8;
   border-color: #0c525d;
@@ -29725,15 +29845,20 @@ a.text-muted:hover {
 }
 
 .accent-white .btn-link,
-.accent-white a {
+.accent-white a:not(.dropdown-item) {
   color: #ffffff;
 }
 
 .accent-white .btn-link:hover,
-.accent-white a:hover {
+.accent-white a:not(.dropdown-item):hover {
   color: #d9d9d9;
 }
 
+.accent-white .dropdown-item.active {
+  background: #ffffff;
+  color: #1F2D3D;
+}
+
 .accent-white .custom-control-input:checked ~ .custom-control-label::before {
   background: #ffffff;
   border-color: #cccccc;
@@ -29765,15 +29890,20 @@ a.text-muted:hover {
 }
 
 .accent-gray .btn-link,
-.accent-gray a {
+.accent-gray a:not(.dropdown-item) {
   color: #6c757d;
 }
 
 .accent-gray .btn-link:hover,
-.accent-gray a:hover {
+.accent-gray a:not(.dropdown-item):hover {
   color: #494f54;
 }
 
+.accent-gray .dropdown-item.active {
+  background: #6c757d;
+  color: #ffffff;
+}
+
 .accent-gray .custom-control-input:checked ~ .custom-control-label::before {
   background: #6c757d;
   border-color: #3d4246;
@@ -29805,15 +29935,20 @@ a.text-muted:hover {
 }
 
 .accent-gray-dark .btn-link,
-.accent-gray-dark a {
+.accent-gray-dark a:not(.dropdown-item) {
   color: #343a40;
 }
 
 .accent-gray-dark .btn-link:hover,
-.accent-gray-dark a:hover {
+.accent-gray-dark a:not(.dropdown-item):hover {
   color: #121416;
 }
 
+.accent-gray-dark .dropdown-item.active {
+  background: #343a40;
+  color: #ffffff;
+}
+
 .accent-gray-dark .custom-control-input:checked ~ .custom-control-label::before {
   background: #343a40;
   border-color: #060708;

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