Various dropdown fixes

joomla · Sep 3, 2023 · eefba7b · eefba7b
1 parent 8890fc9
commit eefba7b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 6 deletions.
diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/build/media_source/templates/administrator/atum/scss/_variables-dark.scss
@@ -1,5 +1,6 @@
 $atum-colors-dark: (
-  template-quickicon-color:        var(--template-bg-dark-5),
+  template-quickicon-color: var(--template-bg-dark-5),
+  focus-shadow:             var(--gray-800),
 ) !default;
 
 $link-hover-color-dark: lighten($light-blue, 20%);
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
@@ -5,10 +5,19 @@
 
   &:disabled,
   &[readonly] {
-    background-color: #e8e8e8;
+    background-color: var(--gray-200);
     opacity: 1;
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      &:disabled,
+      &[readonly] {
+        background-color: var(--gray-800);
+      }
+    }
+  }
+
   &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button,
   &:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: var(--template-bg-dark-50);

diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
@@ -10,6 +10,6 @@
   }
 
   .list-group-item {
-    color: $link-color;
+    --list-group-color: #{$link-color};
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -34,6 +34,14 @@
       color: $form-select-color;
       background-color: var(--white-offset);
     }
+
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        option {
+          background-color: var(--gray-800);
+        }
+      }
+    }
   }
 
   &.form-select-danger,
@@ -46,31 +54,59 @@
       color: $form-select-color;
       background-color: var(--white-offset);
     }
+
+    @if $enable-dark-mode {
+      @include color-mode(dark) {
+        option {
+          background-color: var(--gray-800);
+        }
+      }
+    }
   }
 
   &:disabled {
     cursor: default;
-    background-color: #e8e8e8;
+    background-color: var(--gray-200);
     background-image: none;
     border: 0;
     box-shadow: none;
   }
 
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      &:disabled {
+        background-color: var(--gray-800);
+      }
+    }
+  }
+
   optgroup,
   option {
     color: var(--template-text-dark);
-    background-color: $white;
+    background-color: var(--body-bg);
 
     &:disabled {
       background-color: var(--template-bg-dark-5);
     }
   }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      option {
+        color: var(--template-text-light);
+
+        &:disabled {
+          background-color: var(--template-bg-dark-90);
+        }
+      }
+    }
+  }
 }
 
 @if $enable-dark-mode {
   @include color-mode(dark) {
     .form-select {
-      background: $form-select-background-dark #{"/* rtl:"}$form-select-background-rtl-dark#{"*/"};;
+      background: $form-select-background-dark #{"/* rtl:"}$form-select-background-rtl-dark#{"*/"};
     }
   }
 }