diff options
author | Jeremy Thomas <bbxdesign@gmail.com> | 2020-12-20 15:10:04 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-20 15:10:04 +0300 |
commit | 2cbef5868e3afbc54f8793c6785f6acd0205acb6 (patch) | |
tree | f40fea7b1f4b1f3c07764a55f341abfaa710b031 /sass | |
parent | ab65e4b4373839d0087a46759b70ba0f5e1e3e3f (diff) |
Use single file for extends (#3216)
* Use single file for extends
* Update changelog
Diffstat (limited to 'sass')
-rw-r--r-- | sass/base/_all.sass | 6 | ||||
-rw-r--r-- | sass/components/_all.sass | 24 | ||||
-rw-r--r-- | sass/elements/_all.sass | 24 | ||||
-rw-r--r-- | sass/form/_all.sass | 12 | ||||
-rw-r--r-- | sass/form/checkbox-radio.sass | 2 | ||||
-rw-r--r-- | sass/form/file.sass | 2 | ||||
-rw-r--r-- | sass/form/input-textarea.sass | 2 | ||||
-rw-r--r-- | sass/form/select.sass | 2 | ||||
-rw-r--r-- | sass/form/tools.sass | 2 | ||||
-rw-r--r-- | sass/grid/_all.sass | 4 | ||||
-rw-r--r-- | sass/helpers/_all.sass | 18 | ||||
-rw-r--r-- | sass/layout/_all.sass | 6 | ||||
-rw-r--r-- | sass/utilities/_all.sass | 11 | ||||
-rw-r--r-- | sass/utilities/controls.sass | 5 | ||||
-rw-r--r-- | sass/utilities/derived-variables.sass | 4 | ||||
-rw-r--r-- | sass/utilities/extends.sass | 22 | ||||
-rw-r--r-- | sass/utilities/mixins.sass | 19 |
17 files changed, 79 insertions, 86 deletions
diff --git a/sass/base/_all.sass b/sass/base/_all.sass index 1c7cbfab..a5ae0a7b 100644 --- a/sass/base/_all.sass +++ b/sass/base/_all.sass @@ -1,6 +1,6 @@ /* Bulma Base */ @charset "utf-8" -@import "minireset.sass" -@import "generic.sass" -@import "animations.sass" +@import "minireset" +@import "generic" +@import "animations" diff --git a/sass/components/_all.sass b/sass/components/_all.sass index a9d21967..a7062ec1 100644 --- a/sass/components/_all.sass +++ b/sass/components/_all.sass @@ -1,15 +1,15 @@ /* Bulma Components */ @charset "utf-8" -@import "breadcrumb.sass" -@import "card.sass" -@import "dropdown.sass" -@import "level.sass" -@import "media.sass" -@import "menu.sass" -@import "message.sass" -@import "modal.sass" -@import "navbar.sass" -@import "pagination.sass" -@import "panel.sass" -@import "tabs.sass" +@import "breadcrumb" +@import "card" +@import "dropdown" +@import "level" +@import "media" +@import "menu" +@import "message" +@import "modal" +@import "navbar" +@import "pagination" +@import "panel" +@import "tabs" diff --git a/sass/elements/_all.sass b/sass/elements/_all.sass index 321e5fbc..511047aa 100644 --- a/sass/elements/_all.sass +++ b/sass/elements/_all.sass @@ -1,16 +1,16 @@ /* Bulma Elements */ @charset "utf-8" -@import "box.sass" -@import "button.sass" -@import "container.sass" -@import "content.sass" -@import "icon.sass" -@import "image.sass" -@import "notification.sass" -@import "progress.sass" -@import "table.sass" -@import "tag.sass" -@import "title.sass" +@import "box" +@import "button" +@import "container" +@import "content" +@import "icon" +@import "image" +@import "notification" +@import "progress" +@import "table" +@import "tag" +@import "title" -@import "other.sass" +@import "other" diff --git a/sass/form/_all.sass b/sass/form/_all.sass index ba51c2c4..0a15f80a 100644 --- a/sass/form/_all.sass +++ b/sass/form/_all.sass @@ -1,9 +1,9 @@ /* Bulma Form */ @charset "utf-8" -@import "shared.sass" -@import "input-textarea.sass" -@import "checkbox-radio.sass" -@import "select.sass" -@import "file.sass" -@import "tools.sass" +@import "shared" +@import "input-textarea" +@import "checkbox-radio" +@import "select" +@import "file" +@import "tools" diff --git a/sass/form/checkbox-radio.sass b/sass/form/checkbox-radio.sass index c9e75fc5..f033d113 100644 --- a/sass/form/checkbox-radio.sass +++ b/sass/form/checkbox-radio.sass @@ -1,5 +1,3 @@ -@import "shared" - %checkbox-radio cursor: pointer display: inline-block diff --git a/sass/form/file.sass b/sass/form/file.sass index 395c8cb1..22a5a508 100644 --- a/sass/form/file.sass +++ b/sass/form/file.sass @@ -1,5 +1,3 @@ -@import "shared" - $file-border-color: $border !default $file-radius: $radius !default diff --git a/sass/form/input-textarea.sass b/sass/form/input-textarea.sass index 8fb3c33f..8d842a04 100644 --- a/sass/form/input-textarea.sass +++ b/sass/form/input-textarea.sass @@ -1,5 +1,3 @@ -@import "shared" - $textarea-padding: $control-padding-horizontal !default $textarea-max-height: 40em !default $textarea-min-height: 8em !default diff --git a/sass/form/select.sass b/sass/form/select.sass index 05376705..07fe98cc 100644 --- a/sass/form/select.sass +++ b/sass/form/select.sass @@ -1,5 +1,3 @@ -@import "shared" - $select-colors: $form-colors !default .select diff --git a/sass/form/tools.sass b/sass/form/tools.sass index fc209d61..73b09b64 100644 --- a/sass/form/tools.sass +++ b/sass/form/tools.sass @@ -1,5 +1,3 @@ -@import "shared" - $label-color: $text-strong !default $label-weight: $weight-bold !default diff --git a/sass/grid/_all.sass b/sass/grid/_all.sass index ac83c3e6..0b5ed310 100644 --- a/sass/grid/_all.sass +++ b/sass/grid/_all.sass @@ -1,5 +1,5 @@ /* Bulma Grid */ @charset "utf-8" -@import "columns.sass" -@import "tiles.sass" +@import "columns" +@import "tiles" diff --git a/sass/helpers/_all.sass b/sass/helpers/_all.sass index b316ab4a..d673da68 100644 --- a/sass/helpers/_all.sass +++ b/sass/helpers/_all.sass @@ -1,12 +1,12 @@ /* Bulma Helpers */ @charset "utf-8" -@import "color.sass" -@import "flexbox.sass" -@import "float.sass" -@import "other.sass" -@import "overflow.sass" -@import "position.sass" -@import "spacing.sass" -@import "typography.sass" -@import "visibility.sass" +@import "color" +@import "flexbox" +@import "float" +@import "other" +@import "overflow" +@import "position" +@import "spacing" +@import "typography" +@import "visibility" diff --git a/sass/layout/_all.sass b/sass/layout/_all.sass index a7cf41c1..4d1df5b7 100644 --- a/sass/layout/_all.sass +++ b/sass/layout/_all.sass @@ -1,6 +1,6 @@ /* Bulma Layout */ @charset "utf-8" -@import "hero.sass" -@import "section.sass" -@import "footer.sass" +@import "hero" +@import "section" +@import "footer" diff --git a/sass/utilities/_all.sass b/sass/utilities/_all.sass index 6cc46606..51cf348a 100644 --- a/sass/utilities/_all.sass +++ b/sass/utilities/_all.sass @@ -1,8 +1,9 @@ /* Bulma Utilities */ @charset "utf-8" -@import "initial-variables.sass" -@import "functions.sass" -@import "derived-variables.sass" -@import "mixins.sass" -@import "controls.sass" +@import "initial-variables" +@import "functions" +@import "derived-variables" +@import "mixins" +@import "controls" +@import "extends" diff --git a/sass/utilities/controls.sass b/sass/utilities/controls.sass index c04f3aae..4c738c7f 100644 --- a/sass/utilities/controls.sass +++ b/sass/utilities/controls.sass @@ -1,4 +1,4 @@ -@import "derived-variables.sass" +@import "derived-variables" $control-radius: $radius !default $control-radius-small: $radius-small !default @@ -39,9 +39,6 @@ $control-padding-horizontal: calc(0.75em - #{$control-border-width}) !default fieldset[disabled] & cursor: not-allowed -%control - +control - // The controls sizes use mixins so they can be used at different breakpoints =control-small border-radius: $control-radius-small diff --git a/sass/utilities/derived-variables.sass b/sass/utilities/derived-variables.sass index bc8f4b64..2b9e7e03 100644 --- a/sass/utilities/derived-variables.sass +++ b/sass/utilities/derived-variables.sass @@ -1,5 +1,5 @@ -@import "initial-variables.sass" -@import "functions.sass" +@import "initial-variables" +@import "functions" $primary: $turquoise !default diff --git a/sass/utilities/extends.sass b/sass/utilities/extends.sass new file mode 100644 index 00000000..e7b69fe4 --- /dev/null +++ b/sass/utilities/extends.sass @@ -0,0 +1,22 @@ +@import "mixins" + +%control + +control + +%unselectable + +unselectable + +%arrow + +arrow + +%block + +block + +%delete + +delete + +%loader + +loader + +%overlay + +overlay diff --git a/sass/utilities/mixins.sass b/sass/utilities/mixins.sass index 4b5fcd9c..7b0057fd 100644 --- a/sass/utilities/mixins.sass +++ b/sass/utilities/mixins.sass @@ -161,9 +161,6 @@ -ms-user-select: none user-select: none -%unselectable - +unselectable - =arrow($color: transparent) border: 3px solid $color border-radius: 2px @@ -180,18 +177,12 @@ transform-origin: center width: 0.625em -%arrow - +arrow - =block($spacing: $block-spacing) &:not(:last-child) margin-bottom: $spacing -%block - +block - =delete - @extend %unselectable + +unselectable -moz-appearance: none -webkit-appearance: none background-color: bulmaRgba($scheme-invert, 0.2) @@ -256,9 +247,6 @@ min-width: 32px width: 32px -%delete - +delete - =loader animation: spinAround 500ms infinite linear border: 2px solid $grey-lighter @@ -271,9 +259,6 @@ position: relative width: 1em -%loader - +loader - =overlay($offset: 0) bottom: $offset left: $offset @@ -281,5 +266,3 @@ right: $offset top: $offset -%overlay - +overlay |