diff options
author | Jeremy Thomas <bbxdesign@gmail.com> | 2020-11-01 02:52:27 +0300 |
---|---|---|
committer | Jeremy Thomas <bbxdesign@gmail.com> | 2020-11-07 21:15:20 +0300 |
commit | a6130bf160b78036be9fadf410201744b4326144 (patch) | |
tree | 689215bb274ce2c0fd363b457428701d9bb77cab /sass | |
parent | a9a48d1512e1955c67666d5a0085116ac3b23844 (diff) |
Use imports everywhere
Diffstat (limited to 'sass')
48 files changed, 97 insertions, 8 deletions
diff --git a/sass/base/_all.sass b/sass/base/_all.sass index 8ab98c94..1c7cbfab 100644 --- a/sass/base/_all.sass +++ b/sass/base/_all.sass @@ -3,3 +3,4 @@ @import "minireset.sass" @import "generic.sass" +@import "animations.sass" diff --git a/sass/base/animations.sass b/sass/base/animations.sass new file mode 100644 index 00000000..a14525d7 --- /dev/null +++ b/sass/base/animations.sass @@ -0,0 +1,5 @@ +@keyframes spinAround + from + transform: rotate(0deg) + to + transform: rotate(359deg) diff --git a/sass/base/generic.sass b/sass/base/generic.sass index d067bb00..42c736ae 100644 --- a/sass/base/generic.sass +++ b/sass/base/generic.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $body-background-color: $scheme-main !default $body-size: 16px !default $body-min-width: 300px !default diff --git a/sass/components/breadcrumb.sass b/sass/components/breadcrumb.sass index f42b0b84..60bb17b0 100644 --- a/sass/components/breadcrumb.sass +++ b/sass/components/breadcrumb.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $breadcrumb-item-color: $link !default $breadcrumb-item-hover-color: $link-hover !default $breadcrumb-item-active-color: $text-strong !default diff --git a/sass/components/card.sass b/sass/components/card.sass index b7f350e0..09f1109c 100644 --- a/sass/components/card.sass +++ b/sass/components/card.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $card-color: $text !default $card-background-color: $scheme-main !default $card-shadow: 0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02) !default diff --git a/sass/components/dropdown.sass b/sass/components/dropdown.sass index 62cb66e4..6bf6a3aa 100644 --- a/sass/components/dropdown.sass +++ b/sass/components/dropdown.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $dropdown-menu-min-width: 12rem !default $dropdown-content-background-color: $scheme-main !default diff --git a/sass/components/level.sass b/sass/components/level.sass index 8f731202..0133ebf7 100644 --- a/sass/components/level.sass +++ b/sass/components/level.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $level-item-spacing: ($block-spacing / 2) !default .level diff --git a/sass/components/media.sass b/sass/components/media.sass index cf79276f..fc3f7d16 100644 --- a/sass/components/media.sass +++ b/sass/components/media.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $media-border-color: bulmaRgba($border, 0.5) !default $media-border-size: 1px !default $media-spacing: 1rem !default diff --git a/sass/components/menu.sass b/sass/components/menu.sass index 1bf78297..31dc56fd 100644 --- a/sass/components/menu.sass +++ b/sass/components/menu.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $menu-item-color: $text !default $menu-item-radius: $radius-small !default $menu-item-hover-color: $text-strong !default diff --git a/sass/components/message.sass b/sass/components/message.sass index 180fbe94..ab837803 100644 --- a/sass/components/message.sass +++ b/sass/components/message.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $message-background-color: $background !default $message-radius: $radius !default diff --git a/sass/components/modal.sass b/sass/components/modal.sass index 3992f296..fdbddd6a 100644 --- a/sass/components/modal.sass +++ b/sass/components/modal.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $modal-z: 40 !default $modal-background-background-color: bulmaRgba($scheme-invert, 0.86) !default diff --git a/sass/components/navbar.sass b/sass/components/navbar.sass index 09b98513..bcbcd803 100644 --- a/sass/components/navbar.sass +++ b/sass/components/navbar.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $navbar-background-color: $scheme-main !default $navbar-box-shadow-size: 0 2px 0 0 !default $navbar-box-shadow-color: $background !default diff --git a/sass/components/pagination.sass b/sass/components/pagination.sass index 822c2e81..882de2d0 100644 --- a/sass/components/pagination.sass +++ b/sass/components/pagination.sass @@ -1,3 +1,6 @@ +@import "../utilities/controls" +@import "../utilities/mixins" + $pagination-color: $text-strong !default $pagination-border-color: $border !default $pagination-margin: -0.25rem !default diff --git a/sass/components/panel.sass b/sass/components/panel.sass index 2f7e2754..a9d42fbd 100644 --- a/sass/components/panel.sass +++ b/sass/components/panel.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $panel-margin: $block-spacing !default $panel-item-border: 1px solid $border-light !default $panel-radius: $radius-large !default diff --git a/sass/components/tabs.sass b/sass/components/tabs.sass index 2308bf09..2cb6a543 100644 --- a/sass/components/tabs.sass +++ b/sass/components/tabs.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $tabs-border-bottom-color: $border !default $tabs-border-bottom-style: solid !default $tabs-border-bottom-width: 1px !default diff --git a/sass/elements/box.sass b/sass/elements/box.sass index 2fd18d49..ed70a39a 100644 --- a/sass/elements/box.sass +++ b/sass/elements/box.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $box-color: $text !default $box-background-color: $scheme-main !default $box-radius: $radius-large !default diff --git a/sass/elements/button.sass b/sass/elements/button.sass index 5a1c55ac..e846aab7 100644 --- a/sass/elements/button.sass +++ b/sass/elements/button.sass @@ -1,3 +1,6 @@ +@import "../utilities/controls" +@import "../utilities/mixins" + $button-color: $text-strong !default $button-background-color: $scheme-main !default $button-family: false !default diff --git a/sass/elements/container.sass b/sass/elements/container.sass index e7c00f3e..c13011e3 100644 --- a/sass/elements/container.sass +++ b/sass/elements/container.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $container-offset: (2 * $gap) !default $container-max-width: $fullhd !default diff --git a/sass/elements/content.sass b/sass/elements/content.sass index 800268b7..ebfa9f0e 100644 --- a/sass/elements/content.sass +++ b/sass/elements/content.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $content-heading-color: $text-strong !default $content-heading-weight: $weight-semibold !default $content-heading-line-height: 1.125 !default diff --git a/sass/elements/image.sass b/sass/elements/image.sass index 7547abcf..fc46541f 100644 --- a/sass/elements/image.sass +++ b/sass/elements/image.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $dimensions: 16 24 32 48 64 96 128 !default .image diff --git a/sass/elements/notification.sass b/sass/elements/notification.sass index 31ee712e..f5c60216 100644 --- a/sass/elements/notification.sass +++ b/sass/elements/notification.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $notification-background-color: $background !default $notification-code-background-color: $scheme-main !default $notification-radius: $radius !default diff --git a/sass/elements/other.sass b/sass/elements/other.sass index 5725617c..b993d689 100644 --- a/sass/elements/other.sass +++ b/sass/elements/other.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .block @extend %block diff --git a/sass/elements/progress.sass b/sass/elements/progress.sass index d6d7fce6..4daeb807 100644 --- a/sass/elements/progress.sass +++ b/sass/elements/progress.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $progress-bar-background-color: $border-light !default $progress-value-background-color: $text !default $progress-border-radius: $radius-rounded !default diff --git a/sass/elements/table.sass b/sass/elements/table.sass index bb88e2d4..7ea6c112 100644 --- a/sass/elements/table.sass +++ b/sass/elements/table.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $table-color: $text-strong !default $table-background-color: $scheme-main !default diff --git a/sass/elements/tag.sass b/sass/elements/tag.sass index 9ba30cd0..392daee6 100644 --- a/sass/elements/tag.sass +++ b/sass/elements/tag.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $tag-background-color: $background !default $tag-color: $text !default $tag-radius: $radius !default diff --git a/sass/elements/title.sass b/sass/elements/title.sass index fa9947dd..e87c5316 100644 --- a/sass/elements/title.sass +++ b/sass/elements/title.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $title-color: $text-strong !default $title-family: false !default $title-size: $size-3 !default diff --git a/sass/form/checkbox-radio.sass b/sass/form/checkbox-radio.sass index f033d113..c9e75fc5 100644 --- a/sass/form/checkbox-radio.sass +++ b/sass/form/checkbox-radio.sass @@ -1,3 +1,5 @@ +@import "shared" + %checkbox-radio cursor: pointer display: inline-block diff --git a/sass/form/file.sass b/sass/form/file.sass index 22a5a508..395c8cb1 100644 --- a/sass/form/file.sass +++ b/sass/form/file.sass @@ -1,3 +1,5 @@ +@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 8d842a04..8fb3c33f 100644 --- a/sass/form/input-textarea.sass +++ b/sass/form/input-textarea.sass @@ -1,3 +1,5 @@ +@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 07fe98cc..05376705 100644 --- a/sass/form/select.sass +++ b/sass/form/select.sass @@ -1,3 +1,5 @@ +@import "shared" + $select-colors: $form-colors !default .select diff --git a/sass/form/shared.sass b/sass/form/shared.sass index b5e2ff3b..422d7aa3 100644 --- a/sass/form/shared.sass +++ b/sass/form/shared.sass @@ -1,3 +1,6 @@ +@import "../utilities/controls" +@import "../utilities/mixins" + $form-colors: $colors !default $input-color: $text-strong !default diff --git a/sass/form/tools.sass b/sass/form/tools.sass index 73b09b64..fc209d61 100644 --- a/sass/form/tools.sass +++ b/sass/form/tools.sass @@ -1,3 +1,5 @@ +@import "shared" + $label-color: $text-strong !default $label-weight: $weight-bold !default diff --git a/sass/grid/columns.sass b/sass/grid/columns.sass index af365864..2c6c47c5 100644 --- a/sass/grid/columns.sass +++ b/sass/grid/columns.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $column-gap: 0.75rem !default .column diff --git a/sass/grid/tiles.sass b/sass/grid/tiles.sass index 15648c29..ebd136f6 100644 --- a/sass/grid/tiles.sass +++ b/sass/grid/tiles.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $tile-spacing: 0.75rem !default .tile diff --git a/sass/helpers/color.sass b/sass/helpers/color.sass index 22ac8c51..b7a8a503 100644 --- a/sass/helpers/color.sass +++ b/sass/helpers/color.sass @@ -1,3 +1,5 @@ +@import "../utilities/derived-variables" + @each $name, $pair in $colors $color: nth($pair, 1) .has-text-#{$name} diff --git a/sass/helpers/float.sass b/sass/helpers/float.sass index fc77f179..f62f24e0 100644 --- a/sass/helpers/float.sass +++ b/sass/helpers/float.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-clearfix +clearfix diff --git a/sass/helpers/other.sass b/sass/helpers/other.sass index cb7c4cd6..6e2e63ce 100644 --- a/sass/helpers/other.sass +++ b/sass/helpers/other.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-radiusless border-radius: 0 !important diff --git a/sass/helpers/position.sass b/sass/helpers/position.sass index 083b36b7..4b8fda47 100644 --- a/sass/helpers/position.sass +++ b/sass/helpers/position.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-overlay @extend %overlay diff --git a/sass/helpers/typography.sass b/sass/helpers/typography.sass index eafd7e09..52433155 100644 --- a/sass/helpers/typography.sass +++ b/sass/helpers/typography.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + =typography-size($target:'') @each $size in $sizes $i: index($sizes, $size) diff --git a/sass/helpers/visibility.sass b/sass/helpers/visibility.sass index 92477f3a..a1bb0d56 100644 --- a/sass/helpers/visibility.sass +++ b/sass/helpers/visibility.sass @@ -1,4 +1,4 @@ - +@import "../utilities/mixins" $displays: 'block' 'flex' 'inline' 'inline-block' 'inline-flex' diff --git a/sass/layout/footer.sass b/sass/layout/footer.sass index 8faa11ed..4e9187e1 100644 --- a/sass/layout/footer.sass +++ b/sass/layout/footer.sass @@ -1,3 +1,5 @@ +@import "../utilities/derived-variables" + $footer-background-color: $scheme-main-bis !default $footer-color: false !default $footer-padding: 3rem 1.5rem 6rem !default diff --git a/sass/layout/hero.sass b/sass/layout/hero.sass index 996e0cdf..491e976b 100644 --- a/sass/layout/hero.sass +++ b/sass/layout/hero.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $hero-body-padding: 3rem 1.5rem !default $hero-body-padding-small: 1.5rem !default $hero-body-padding-medium: 9rem 1.5rem !default diff --git a/sass/layout/section.sass b/sass/layout/section.sass index 6f2d3523..25e70383 100644 --- a/sass/layout/section.sass +++ b/sass/layout/section.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $section-padding: 3rem 1.5rem !default $section-padding-medium: 9rem 1.5rem !default $section-padding-large: 18rem 1.5rem !default diff --git a/sass/utilities/_all.sass b/sass/utilities/_all.sass index ea06fc4a..6cc46606 100644 --- a/sass/utilities/_all.sass +++ b/sass/utilities/_all.sass @@ -4,6 +4,5 @@ @import "initial-variables.sass" @import "functions.sass" @import "derived-variables.sass" -@import "animations.sass" @import "mixins.sass" @import "controls.sass" diff --git a/sass/utilities/animations.sass b/sass/utilities/animations.sass index a14525d7..1872e08c 100644 --- a/sass/utilities/animations.sass +++ b/sass/utilities/animations.sass @@ -1,5 +1 @@ -@keyframes spinAround - from - transform: rotate(0deg) - to - transform: rotate(359deg) +@warn "The animations.sass file has MOVED. It is now in the /base folder. Please import sass/base/animations instead." diff --git a/sass/utilities/controls.sass b/sass/utilities/controls.sass index cc7672a1..c04f3aae 100644 --- a/sass/utilities/controls.sass +++ b/sass/utilities/controls.sass @@ -1,3 +1,5 @@ +@import "derived-variables.sass" + $control-radius: $radius !default $control-radius-small: $radius-small !default diff --git a/sass/utilities/derived-variables.sass b/sass/utilities/derived-variables.sass index 84efe091..bc8f4b64 100644 --- a/sass/utilities/derived-variables.sass +++ b/sass/utilities/derived-variables.sass @@ -1,3 +1,6 @@ +@import "initial-variables.sass" +@import "functions.sass" + $primary: $turquoise !default $info: $cyan !default diff --git a/sass/utilities/mixins.sass b/sass/utilities/mixins.sass index 0ed78c15..4b5fcd9c 100644 --- a/sass/utilities/mixins.sass +++ b/sass/utilities/mixins.sass @@ -1,4 +1,4 @@ -@import "initial-variables" +@import "derived-variables" =clearfix &::after |