fix(buttons,toggles): border and background color when active 147629 #…

…139
eea · Apr 4, 2022 · ea36f31 · ea36f31
2 parents a24d846 + bfc4c51
commit ea36f31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/theme/themes/eea/elements/button.overrides b/theme/themes/eea/elements/button.overrides
@@ -11,17 +11,19 @@
 }
 
 /* Global Button Styles */
-.ui.button,
-.ui.buttons .button,
-.ui.buttons {
-  border: @buttonBorder @backgroundColor;
-
-  &:hover,
-  &:active,
-  &:focus {
-    border-color: @hoverBackgroundColor;
-  }
-}
+// 147629 to remove later, basic buttons don't need borders, svg buttons are
+// basic and volto ui has elements that are highlighted because of it
+//.ui.button,
+//.ui.buttons .button,
+//.ui.buttons {
+//  border: @buttonBorder @backgroundColor;
+//
+//  &:hover,
+//  &:active,
+//  &:focus {
+//    border-color: @hoverBackgroundColor;
+//  }
+//}
 
 /* Primary Button Border */
 .ui.button.primary,

diff --git a/theme/themes/eea/elements/button.variables b/theme/themes/eea/elements/button.variables
@@ -241,7 +241,7 @@
 @basicBackground: transparent none;
 @basicFontWeight: @normal;
 @basicBorder: 1px solid @borderColor;
-@basicBoxShadow: 0px 0px 0px @basicBorderSize @textColor inset;
+@basicBoxShadow: none; // remove basic box shadow by default
 @basicLoadingColor: @offWhite;
 @basicTextTransform: none;
 

diff --git a/theme/themes/eea/modules/checkbox.overrides b/theme/themes/eea/modules/checkbox.overrides
@@ -9,13 +9,13 @@
 }
 
 /* Checkbox */
-.ui.checkbox {
+.ui.checkbox:not(.toggle) {
   margin-bottom: @bottomMargin;
 
   input {
     &:checked ~ label {
       &:after {
-        // background-color: @primaryColor;
+        background-color: @primaryColor;
         font-family: Checkbox;
       }
     }