fieldset disabled styles (#1682)

* fieldset disabled styles

* Added disabled styles to button elements included inside a disabled fieldset

* Added comma, and fieldset element reset

* fieldset doesn't need display block

diff --git a/sass/base/generic.sass b/sass/base/generic.sass
index bb0e37af383aff55fd503d652a95d12dec4e9f43..42a3d8890792e673a50bc4df7e66642126809b04 100644 (file)
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@@ -103,6 +103,9 @@ strong
 
 // Block
 
+fieldset
+  border: none
+
 pre
   +overflow-touch
   background-color: $pre-background

diff --git a/sass/elements/button.sass b/sass/elements/button.sass
index b23cc33abc6d2520506982e1ff1a430c8bece845..1146136498501b9e7816d8a718fbe9f9d1926391 100644 (file)
--- a/sass/elements/button.sass
+++ b/sass/elements/button.sass
@@ -104,7 +104,8 @@ $button-static-border-color: $grey-lighter !default
     &.is-active
       background-color: darken($button-text-hover-background-color, 5%)
       color: $button-text-hover-color
-    &[disabled]
+    &[disabled],
+    fieldset[disabled] &
       background-color: transparent
       border-color: transparent
       box-shadow: none
@@ -131,7 +132,8 @@ $button-static-border-color: $grey-lighter !default
         background-color: darken($color, 5%)
         border-color: transparent
         color: $color-invert
-      &[disabled]
+      &[disabled],
+      fieldset[disabled] &
         background-color: $color
         border-color: transparent
         box-shadow: none
@@ -140,7 +142,8 @@ $button-static-border-color: $grey-lighter !default
         color: $color
         &:hover
           background-color: darken($color-invert, 5%)
-        &[disabled]
+        &[disabled],
+        fieldset[disabled] &
           background-color: $color-invert
           border-color: transparent
           box-shadow: none
@@ -160,7 +163,8 @@ $button-static-border-color: $grey-lighter !default
         &.is-loading
           &::after
             border-color: transparent transparent $color $color !important
-        &[disabled]
+        &[disabled],
+        fieldset[disabled] &
           background-color: transparent
           border-color: $color
           box-shadow: none
@@ -173,7 +177,8 @@ $button-static-border-color: $grey-lighter !default
         &:focus
           background-color: $color-invert
           color: $color
-        &[disabled]
+        &[disabled],
+        fieldset[disabled] &
           background-color: transparent
           border-color: $color-invert
           box-shadow: none
@@ -186,7 +191,8 @@ $button-static-border-color: $grey-lighter !default
   &.is-large
     +button-large
   // Modifiers
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     background-color: $button-disabled-background-color
     border-color: $button-disabled-border-color
     box-shadow: $button-disabled-shadow

diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index c722ba4492e12eb072251b370dd2318dd526fdd8..a9e2d4e41dacb10663e2a728817651565433fde9 100644 (file)
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -43,6 +43,7 @@ $label-weight: $weight-bold !default
 
 $help-size: $size-small !default
 
+
 =input
   @extend %control
   background-color: $input-background-color
@@ -59,7 +60,8 @@ $help-size: $size-small !default
   &.is-active
     border-color: $input-focus-border-color
     box-shadow: $input-focus-box-shadow-size $input-focus-box-shadow-color
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     background-color: $input-disabled-background-color
     border-color: $input-disabled-border-color
     box-shadow: none
@@ -137,7 +139,8 @@ $help-size: $size-small !default
     cursor: pointer
   &:hover
     color: $input-hover-color
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     color: $input-disabled-color
     cursor: not-allowed
 
@@ -171,7 +174,8 @@ $help-size: $size-small !default
     outline: none
     &::-ms-expand
       display: none
-    &[disabled]:hover
+    &[disabled]:hover,
+    fieldset[disabled] &:hover
       border-color: $input-disabled-border-color
     &:not([multiple])
       padding-right: 2.5em

diff --git a/sass/utilities/controls.sass b/sass/utilities/controls.sass
index 074072f3c4059396951ef12a7db7e19b7da0fb7d..7ca05213fbd2bab4de60a8d40c99531107593e58 100644 (file)
--- a/sass/utilities/controls.sass
+++ b/sass/utilities/controls.sass
@@ -33,7 +33,8 @@ $control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
   &:active,
   &.is-active
     outline: none
-  &[disabled]
+  &[disabled],
+  fieldset[disabled] &
     cursor: not-allowed
 
 %control