Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fieldset disabled styles #1682

Merged
merged 5 commits into from
Oct 31, 2018
Merged

fieldset disabled styles #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fa14e9
fieldset disabled styles
samburgers Feb 21, 2018
f2af04f
Added disabled styles to button elements included inside a disabled f…
samburgers Mar 31, 2018
011aabe
Merge remote-tracking branch 'upstream/master'
samburgers Apr 14, 2018
050ac16
Added comma, and fieldset element reset
samburgers Apr 14, 2018
859ca75
fieldset doesn't need display block
samburgers Apr 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sass/base/generic.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ strong

// Block

fieldset
border: none

pre
+overflow-touch
background-color: $pre-background
Expand Down
18 changes: 12 additions & 6 deletions sass/elements/button.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 7 additions & 3 deletions sass/elements/form.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ $label-weight: $weight-bold !default

$help-size: $size-small !default


=input
+control
background-color: $input-background-color
Expand All @@ -56,7 +57,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
Expand Down Expand Up @@ -134,7 +136,8 @@ $help-size: $size-small !default
cursor: pointer
&:hover
color: $input-hover-color
&[disabled]
&[disabled],
fieldset[disabled] &
color: $input-disabled-color
cursor: not-allowed

Expand Down Expand Up @@ -167,7 +170,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
Expand Down
3 changes: 2 additions & 1 deletion sass/utilities/controls.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ $control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
&:active,
&.is-active
outline: none
&[disabled]
&[disabled],
fieldset[disabled] &
cursor: not-allowed

=control
Expand Down