From 26950a7bd47b177ae0016c3e09d5d8abc42cc792 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 6 Nov 2023 17:07:51 +0000 Subject: [PATCH] Update bulma, adjust font --- themes/lhs/assets/sass/base/_all.sass | 5 - themes/lhs/assets/sass/base/helpers.sass | 281 ------------------ themes/lhs/assets/sass/bulma.sass | 18 +- themes/lhs/assets/sass/bulma/base/_all.sass | 6 + .../{utilities => bulma/base}/animations.sass | 0 .../assets/sass/{ => bulma}/base/generic.sass | 7 +- .../lhs/assets/sass/bulma/base/helpers.sass | 1 + .../sass/{ => bulma}/base/minireset.sass | 10 +- .../assets/sass/bulma/components/_all.sass | 15 + .../{ => bulma}/components/breadcrumb.sass | 10 +- .../sass/{ => bulma}/components/card.sass | 36 ++- .../sass/{ => bulma}/components/dropdown.sass | 18 +- .../sass/{ => bulma}/components/level.sass | 8 +- .../assets/sass/bulma/components/media.sass | 59 ++++ .../sass/{ => bulma}/components/menu.sass | 6 +- .../sass/{ => bulma}/components/message.sass | 36 ++- .../sass/{ => bulma}/components/modal.sass | 14 +- .../sass/{ => bulma}/components/navbar.sass | 57 ++-- .../{ => bulma}/components/pagination.sass | 36 ++- .../sass/{ => bulma}/components/panel.sass | 46 ++- .../sass/{ => bulma}/components/tabs.sass | 51 +++- .../lhs/assets/sass/bulma/elements/_all.sass | 16 + .../assets/sass/{ => bulma}/elements/box.sass | 10 +- .../sass/{ => bulma}/elements/button.sass | 114 +++++-- .../assets/sass/bulma/elements/container.sass | 29 ++ .../sass/{ => bulma}/elements/content.sass | 21 +- .../sass/{ => bulma}/elements/form.sass | 0 .../sass/{ => bulma}/elements/icon.sass | 25 ++ .../sass/{ => bulma}/elements/image.sass | 4 + .../{ => bulma}/elements/notification.sass | 25 +- .../sass/{ => bulma}/elements/other.sass | 12 +- .../sass/{ => bulma}/elements/progress.sass | 10 +- .../sass/{ => bulma}/elements/table.sass | 23 +- .../assets/sass/{ => bulma}/elements/tag.sass | 53 ++-- .../sass/{ => bulma}/elements/title.sass | 10 +- themes/lhs/assets/sass/bulma/form/_all.sass | 9 + .../sass/{ => bulma}/form/checkbox-radio.sass | 5 +- .../assets/sass/{ => bulma}/form/file.sass | 32 +- .../sass/{ => bulma}/form/input-textarea.sass | 20 +- .../assets/sass/{ => bulma}/form/select.sass | 19 +- .../assets/sass/{ => bulma}/form/shared.sass | 29 +- .../assets/sass/{ => bulma}/form/tools.sass | 34 ++- themes/lhs/assets/sass/bulma/grid/_all.sass | 5 + .../assets/sass/{ => bulma}/grid/columns.sass | 177 +++++------ .../assets/sass/{ => bulma}/grid/tiles.sass | 4 +- .../lhs/assets/sass/bulma/helpers/_all.sass | 12 + .../sass/{ => bulma}/helpers/color.sass | 2 + .../sass/{ => bulma}/helpers/flexbox.sass | 0 .../sass/{ => bulma}/helpers/float.sass | 2 + .../sass/{ => bulma}/helpers/other.sass | 3 + .../sass/{ => bulma}/helpers/overflow.sass | 0 .../sass/{ => bulma}/helpers/position.sass | 2 + .../sass/{ => bulma}/helpers/spacing.sass | 2 +- .../sass/{ => bulma}/helpers/typography.sass | 5 + .../sass/{ => bulma}/helpers/visibility.sass | 2 +- themes/lhs/assets/sass/bulma/layout/_all.sass | 6 + .../sass/{ => bulma}/layout/footer.sass | 4 +- .../assets/sass/{ => bulma}/layout/hero.sass | 52 ++-- .../sass/{ => bulma}/layout/section.sass | 8 +- .../lhs/assets/sass/bulma/utilities/_all.sass | 9 + .../sass/bulma/utilities/animations.sass | 1 + .../sass/{ => bulma}/utilities/controls.sass | 11 +- .../utilities/derived-variables.sass | 49 ++- .../assets/sass/bulma/utilities/extends.sass | 25 ++ .../sass/bulma/utilities/functions.sass | 135 +++++++++ .../utilities/initial-variables.sass | 17 +- .../sass/{ => bulma}/utilities/mixins.sass | 100 +++++-- themes/lhs/assets/sass/components/_all.sass | 15 - themes/lhs/assets/sass/components/list.sass | 39 --- themes/lhs/assets/sass/components/media.sass | 48 --- themes/lhs/assets/sass/elements/_all.sass | 15 - .../lhs/assets/sass/elements/container.sass | 23 -- themes/lhs/assets/sass/form/_all.sass | 8 - themes/lhs/assets/sass/grid/_all.sass | 4 - themes/lhs/assets/sass/helpers/_all.sass | 12 - themes/lhs/assets/sass/layout/_all.sass | 5 - themes/lhs/assets/sass/leighhack.scss | 12 +- themes/lhs/assets/sass/utilities/_all.sass | 8 - .../lhs/assets/sass/utilities/functions.sass | 62 ---- 79 files changed, 1146 insertions(+), 958 deletions(-) delete mode 100644 themes/lhs/assets/sass/base/_all.sass delete mode 100644 themes/lhs/assets/sass/base/helpers.sass create mode 100644 themes/lhs/assets/sass/bulma/base/_all.sass rename themes/lhs/assets/sass/{utilities => bulma/base}/animations.sass (100%) rename themes/lhs/assets/sass/{ => bulma}/base/generic.sass (95%) create mode 100644 themes/lhs/assets/sass/bulma/base/helpers.sass rename themes/lhs/assets/sass/{ => bulma}/base/minireset.sass (82%) create mode 100644 themes/lhs/assets/sass/bulma/components/_all.sass rename themes/lhs/assets/sass/{ => bulma}/components/breadcrumb.sass (88%) rename themes/lhs/assets/sass/{ => bulma}/components/card.sass (63%) rename themes/lhs/assets/sass/{ => bulma}/components/dropdown.sass (83%) rename themes/lhs/assets/sass/{ => bulma}/components/level.sass (87%) create mode 100644 themes/lhs/assets/sass/bulma/components/media.sass rename themes/lhs/assets/sass/{ => bulma}/components/menu.sass (90%) rename themes/lhs/assets/sass/{ => bulma}/components/message.sass (70%) rename themes/lhs/assets/sass/{ => bulma}/components/modal.sass (89%) rename themes/lhs/assets/sass/{ => bulma}/components/navbar.sass (88%) rename themes/lhs/assets/sass/{ => bulma}/components/pagination.sass (80%) rename themes/lhs/assets/sass/{ => bulma}/components/panel.sass (68%) rename themes/lhs/assets/sass/{ => bulma}/components/tabs.sass (72%) create mode 100644 themes/lhs/assets/sass/bulma/elements/_all.sass rename themes/lhs/assets/sass/{ => bulma}/elements/box.sass (57%) rename themes/lhs/assets/sass/{ => bulma}/elements/button.sass (66%) create mode 100644 themes/lhs/assets/sass/bulma/elements/container.sass rename themes/lhs/assets/sass/{ => bulma}/elements/content.sass (86%) rename themes/lhs/assets/sass/{ => bulma}/elements/form.sass (100%) rename themes/lhs/assets/sass/{ => bulma}/elements/icon.sass (51%) rename themes/lhs/assets/sass/{ => bulma}/elements/image.sass (94%) rename themes/lhs/assets/sass/{ => bulma}/elements/notification.sass (50%) rename themes/lhs/assets/sass/{ => bulma}/elements/other.sass (76%) rename themes/lhs/assets/sass/{ => bulma}/elements/progress.sass (89%) rename themes/lhs/assets/sass/{ => bulma}/elements/table.sass (83%) rename themes/lhs/assets/sass/{ => bulma}/elements/tag.sass (65%) rename themes/lhs/assets/sass/{ => bulma}/elements/title.sass (90%) create mode 100644 themes/lhs/assets/sass/bulma/form/_all.sass rename themes/lhs/assets/sass/{ => bulma}/form/checkbox-radio.sass (79%) rename themes/lhs/assets/sass/{ => bulma}/form/file.sass (81%) rename themes/lhs/assets/sass/{ => bulma}/form/input-textarea.sass (64%) rename themes/lhs/assets/sass/{ => bulma}/form/select.sass (79%) rename themes/lhs/assets/sass/{ => bulma}/form/shared.sass (60%) rename themes/lhs/assets/sass/{ => bulma}/form/tools.sass (85%) create mode 100644 themes/lhs/assets/sass/bulma/grid/_all.sass rename themes/lhs/assets/sass/{ => bulma}/grid/columns.sass (72%) rename themes/lhs/assets/sass/{ => bulma}/grid/tiles.sass (91%) create mode 100644 themes/lhs/assets/sass/bulma/helpers/_all.sass rename themes/lhs/assets/sass/{ => bulma}/helpers/color.sass (96%) rename themes/lhs/assets/sass/{ => bulma}/helpers/flexbox.sass (100%) rename themes/lhs/assets/sass/{ => bulma}/helpers/float.sass (78%) rename themes/lhs/assets/sass/{ => bulma}/helpers/other.sass (73%) rename themes/lhs/assets/sass/{ => bulma}/helpers/overflow.sass (100%) rename themes/lhs/assets/sass/{ => bulma}/helpers/position.sass (71%) rename themes/lhs/assets/sass/{ => bulma}/helpers/spacing.sass (94%) rename themes/lhs/assets/sass/{ => bulma}/helpers/typography.sass (96%) rename themes/lhs/assets/sass/{ => bulma}/helpers/visibility.sass (98%) create mode 100644 themes/lhs/assets/sass/bulma/layout/_all.sass rename themes/lhs/assets/sass/{ => bulma}/layout/footer.sass (67%) rename themes/lhs/assets/sass/{ => bulma}/layout/hero.sass (64%) rename themes/lhs/assets/sass/{ => bulma}/layout/section.sass (52%) create mode 100644 themes/lhs/assets/sass/bulma/utilities/_all.sass create mode 100644 themes/lhs/assets/sass/bulma/utilities/animations.sass rename themes/lhs/assets/sass/{ => bulma}/utilities/controls.sass (83%) rename themes/lhs/assets/sass/{ => bulma}/utilities/derived-variables.sass (52%) create mode 100644 themes/lhs/assets/sass/bulma/utilities/extends.sass create mode 100644 themes/lhs/assets/sass/bulma/utilities/functions.sass rename themes/lhs/assets/sass/{ => bulma}/utilities/initial-variables.sass (63%) rename themes/lhs/assets/sass/{ => bulma}/utilities/mixins.sass (73%) delete mode 100644 themes/lhs/assets/sass/components/_all.sass delete mode 100644 themes/lhs/assets/sass/components/list.sass delete mode 100644 themes/lhs/assets/sass/components/media.sass delete mode 100644 themes/lhs/assets/sass/elements/_all.sass delete mode 100644 themes/lhs/assets/sass/elements/container.sass delete mode 100644 themes/lhs/assets/sass/form/_all.sass delete mode 100644 themes/lhs/assets/sass/grid/_all.sass delete mode 100644 themes/lhs/assets/sass/helpers/_all.sass delete mode 100644 themes/lhs/assets/sass/layout/_all.sass delete mode 100644 themes/lhs/assets/sass/utilities/_all.sass delete mode 100644 themes/lhs/assets/sass/utilities/functions.sass diff --git a/themes/lhs/assets/sass/base/_all.sass b/themes/lhs/assets/sass/base/_all.sass deleted file mode 100644 index e913d6b..0000000 --- a/themes/lhs/assets/sass/base/_all.sass +++ /dev/null @@ -1,5 +0,0 @@ -@charset "utf-8" - -@import "minireset.sass" -@import "generic.sass" -@import "helpers.sass" diff --git a/themes/lhs/assets/sass/base/helpers.sass b/themes/lhs/assets/sass/base/helpers.sass deleted file mode 100644 index bbb489d..0000000 --- a/themes/lhs/assets/sass/base/helpers.sass +++ /dev/null @@ -1,281 +0,0 @@ -// Float - -.is-clearfix - +clearfix - -.is-pulled-left - float: left !important - -.is-pulled-right - float: right !important - -// Overflow - -.is-clipped - overflow: hidden !important - -// Overlay - -.is-overlay - @extend %overlay - -// Typography - -=typography-size($target:'') - @each $size in $sizes - $i: index($sizes, $size) - .is-size-#{$i}#{if($target == '', '', '-' + $target)} - font-size: $size !important - -+typography-size() - -+mobile - +typography-size('mobile') - -+tablet - +typography-size('tablet') - -+touch - +typography-size('touch') - -+desktop - +typography-size('desktop') - -+widescreen - +typography-size('widescreen') - -+fullhd - +typography-size('fullhd') - -$alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'right': 'right') - -@each $alignment, $text-align in $alignments - .has-text-#{$alignment} - text-align: #{$text-align} !important - -@each $alignment, $text-align in $alignments - +mobile - .has-text-#{$alignment}-mobile - text-align: #{$text-align} !important - +tablet - .has-text-#{$alignment}-tablet - text-align: #{$text-align} !important - +tablet-only - .has-text-#{$alignment}-tablet-only - text-align: #{$text-align} !important - +touch - .has-text-#{$alignment}-touch - text-align: #{$text-align} !important - +desktop - .has-text-#{$alignment}-desktop - text-align: #{$text-align} !important - +desktop-only - .has-text-#{$alignment}-desktop-only - text-align: #{$text-align} !important - +widescreen - .has-text-#{$alignment}-widescreen - text-align: #{$text-align} !important - +widescreen-only - .has-text-#{$alignment}-widescreen-only - text-align: #{$text-align} !important - +fullhd - .has-text-#{$alignment}-fullhd - text-align: #{$text-align} !important - -.is-capitalized - text-transform: capitalize !important - -.is-lowercase - text-transform: lowercase !important - -.is-uppercase - text-transform: uppercase !important - -.is-italic - font-style: italic !important - -@each $name, $pair in $colors - $color: nth($pair, 1) - .has-text-#{$name} - color: $color !important - a.has-text-#{$name} - &:hover, - &:focus - color: darken($color, 10%) !important - .has-background-#{$name} - background-color: $color !important - -@each $name, $shade in $shades - .has-text-#{$name} - color: $shade !important - .has-background-#{$name} - background-color: $shade !important - -.has-text-weight-light - font-weight: $weight-light !important -.has-text-weight-normal - font-weight: $weight-normal !important -.has-text-weight-medium - font-weight: $weight-medium !important -.has-text-weight-semibold - font-weight: $weight-semibold !important -.has-text-weight-bold - font-weight: $weight-bold !important - -.is-family-primary - font-family: $family-primary !important - -.is-family-secondary - font-family: $family-secondary !important - -.is-family-sans-serif - font-family: $family-sans-serif !important - -.is-family-monospace - font-family: $family-monospace !important - -.is-family-code - font-family: $family-code !important - -// Visibility - -$displays: 'block' 'flex' 'inline' 'inline-block' 'inline-flex' - -@each $display in $displays - .is-#{$display} - display: #{$display} !important - +mobile - .is-#{$display}-mobile - display: #{$display} !important - +tablet - .is-#{$display}-tablet - display: #{$display} !important - +tablet-only - .is-#{$display}-tablet-only - display: #{$display} !important - +touch - .is-#{$display}-touch - display: #{$display} !important - +desktop - .is-#{$display}-desktop - display: #{$display} !important - +desktop-only - .is-#{$display}-desktop-only - display: #{$display} !important - +widescreen - .is-#{$display}-widescreen - display: #{$display} !important - +widescreen-only - .is-#{$display}-widescreen-only - display: #{$display} !important - +fullhd - .is-#{$display}-fullhd - display: #{$display} !important - -.is-hidden - display: none !important - -.is-sr-only - border: none !important - clip: rect(0, 0, 0, 0) !important - height: 0.01em !important - overflow: hidden !important - padding: 0 !important - position: absolute !important - white-space: nowrap !important - width: 0.01em !important - -+mobile - .is-hidden-mobile - display: none !important - -+tablet - .is-hidden-tablet - display: none !important - -+tablet-only - .is-hidden-tablet-only - display: none !important - -+touch - .is-hidden-touch - display: none !important - -+desktop - .is-hidden-desktop - display: none !important - -+desktop-only - .is-hidden-desktop-only - display: none !important - -+widescreen - .is-hidden-widescreen - display: none !important - -+widescreen-only - .is-hidden-widescreen-only - display: none !important - -+fullhd - .is-hidden-fullhd - display: none !important - -.is-invisible - visibility: hidden !important - -+mobile - .is-invisible-mobile - visibility: hidden !important - -+tablet - .is-invisible-tablet - visibility: hidden !important - -+tablet-only - .is-invisible-tablet-only - visibility: hidden !important - -+touch - .is-invisible-touch - visibility: hidden !important - -+desktop - .is-invisible-desktop - visibility: hidden !important - -+desktop-only - .is-invisible-desktop-only - visibility: hidden !important - -+widescreen - .is-invisible-widescreen - visibility: hidden !important - -+widescreen-only - .is-invisible-widescreen-only - visibility: hidden !important - -+fullhd - .is-invisible-fullhd - visibility: hidden !important - -// Other - -.is-marginless - margin: 0 !important - -.is-paddingless - padding: 0 !important - -.is-radiusless - border-radius: 0 !important - -.is-shadowless - box-shadow: none !important - -.is-unselectable - @extend %unselectable - -.is-relative - position: relative !important diff --git a/themes/lhs/assets/sass/bulma.sass b/themes/lhs/assets/sass/bulma.sass index e30e8e3..cf8a30f 100644 --- a/themes/lhs/assets/sass/bulma.sass +++ b/themes/lhs/assets/sass/bulma.sass @@ -1,10 +1,10 @@ @charset "utf-8" -/*! bulma.io v0.7.5 | MIT License | github.com/jgthms/bulma */ -@import "utilities/_all" -@import "base/_all" -@import "elements/_all" -@import "form/_all" -@import "components/_all" -@import "grid/_all" -@import "layout/_all" -@import "helpers/_all" +/*! bulma.io v0.9.4 | MIT License | github.com/jgthms/bulma */ +@import "bulma/utilities/_all" +@import "bulma/base/_all" +@import "bulma/elements/_all" +@import "bulma/form/_all" +@import "bulma/components/_all" +@import "bulma/grid/_all" +@import "bulma/helpers/_all" +@import "bulma/layout/_all" diff --git a/themes/lhs/assets/sass/bulma/base/_all.sass b/themes/lhs/assets/sass/bulma/base/_all.sass new file mode 100644 index 0000000..a5ae0a7 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/base/_all.sass @@ -0,0 +1,6 @@ +/* Bulma Base */ +@charset "utf-8" + +@import "minireset" +@import "generic" +@import "animations" diff --git a/themes/lhs/assets/sass/utilities/animations.sass b/themes/lhs/assets/sass/bulma/base/animations.sass similarity index 100% rename from themes/lhs/assets/sass/utilities/animations.sass rename to themes/lhs/assets/sass/bulma/base/animations.sass diff --git a/themes/lhs/assets/sass/base/generic.sass b/themes/lhs/assets/sass/bulma/base/generic.sass similarity index 95% rename from themes/lhs/assets/sass/base/generic.sass rename to themes/lhs/assets/sass/bulma/base/generic.sass index 376cd5e..42c736a 100644 --- a/themes/lhs/assets/sass/base/generic.sass +++ b/themes/lhs/assets/sass/bulma/base/generic.sass @@ -1,4 +1,6 @@ -$body-background-color: $white !default +@import "../utilities/mixins" + +$body-background-color: $scheme-main !default $body-size: 16px !default $body-min-width: 300px !default $body-rendering: optimizeLegibility !default @@ -52,6 +54,7 @@ section body, button, input, +optgroup, select, textarea font-family: $body-family @@ -137,6 +140,6 @@ table th vertical-align: top &:not([align]) - text-align: left + text-align: inherit th color: $text-strong diff --git a/themes/lhs/assets/sass/bulma/base/helpers.sass b/themes/lhs/assets/sass/bulma/base/helpers.sass new file mode 100644 index 0000000..e356830 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/base/helpers.sass @@ -0,0 +1 @@ +@warn "The helpers.sass file is DEPRECATED. It has moved into its own /helpers folder. Please import sass/helpers/_all instead." diff --git a/themes/lhs/assets/sass/base/minireset.sass b/themes/lhs/assets/sass/bulma/base/minireset.sass similarity index 82% rename from themes/lhs/assets/sass/base/minireset.sass rename to themes/lhs/assets/sass/bulma/base/minireset.sass index a488f12..aa2b6f3 100644 --- a/themes/lhs/assets/sass/base/minireset.sass +++ b/themes/lhs/assets/sass/bulma/base/minireset.sass @@ -1,4 +1,4 @@ -/*! minireset.css v0.0.4 | MIT License | github.com/jgthms/minireset.css */ +/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */ // Blocks html, body, @@ -59,16 +59,10 @@ html // Media img, -embed, -iframe, -object, video height: auto max-width: 100% -audio - max-width: 100% - // Iframe iframe border: 0 @@ -82,4 +76,4 @@ td, th padding: 0 &:not([align]) - text-align: left + text-align: inherit diff --git a/themes/lhs/assets/sass/bulma/components/_all.sass b/themes/lhs/assets/sass/bulma/components/_all.sass new file mode 100644 index 0000000..a7062ec --- /dev/null +++ b/themes/lhs/assets/sass/bulma/components/_all.sass @@ -0,0 +1,15 @@ +/* Bulma Components */ +@charset "utf-8" + +@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/themes/lhs/assets/sass/components/breadcrumb.sass b/themes/lhs/assets/sass/bulma/components/breadcrumb.sass similarity index 88% rename from themes/lhs/assets/sass/components/breadcrumb.sass rename to themes/lhs/assets/sass/bulma/components/breadcrumb.sass index bcbd15b..60bb17b 100644 --- a/themes/lhs/assets/sass/components/breadcrumb.sass +++ b/themes/lhs/assets/sass/bulma/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 @@ -5,7 +7,7 @@ $breadcrumb-item-active-color: $text-strong !default $breadcrumb-item-padding-vertical: 0 !default $breadcrumb-item-padding-horizontal: 0.75em !default -$breadcrumb-item-separator-color: $grey-light !default +$breadcrumb-item-separator-color: $border-hover !default .breadcrumb @extend %block @@ -24,7 +26,7 @@ $breadcrumb-item-separator-color: $grey-light !default align-items: center display: flex &:first-child a - padding-left: 0 + +ltr-property("padding", 0, false) &.is-active a color: $breadcrumb-item-active-color @@ -41,9 +43,9 @@ $breadcrumb-item-separator-color: $grey-light !default justify-content: flex-start .icon &:first-child - margin-right: 0.5em + +ltr-property("margin", 0.5em) &:last-child - margin-left: 0.5em + +ltr-property("margin", 0.5em, false) // Alignment &.is-centered ol, diff --git a/themes/lhs/assets/sass/components/card.sass b/themes/lhs/assets/sass/bulma/components/card.sass similarity index 63% rename from themes/lhs/assets/sass/components/card.sass rename to themes/lhs/assets/sass/bulma/components/card.sass index ca231a5..73387f3 100644 --- a/themes/lhs/assets/sass/components/card.sass +++ b/themes/lhs/assets/sass/bulma/components/card.sass @@ -1,30 +1,43 @@ +@import "../utilities/mixins" + $card-color: $text !default -$card-background-color: $white !default -$card-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default +$card-background-color: $scheme-main !default +$card-shadow: $shadow !default +$card-radius: 0.25rem !default $card-header-background-color: transparent !default $card-header-color: $text-strong !default -$card-header-padding: 0.75rem !default -$card-header-shadow: 0 1px 2px rgba($black, 0.1) !default +$card-header-padding: 0.75rem 1rem !default +$card-header-shadow: 0 0.125em 0.25em rgba($scheme-invert, 0.1) !default $card-header-weight: $weight-bold !default $card-content-background-color: transparent !default $card-content-padding: 1.5rem !default $card-footer-background-color: transparent !default -$card-footer-border-top: 1px solid $border !default +$card-footer-border-top: 1px solid $border-light !default $card-footer-padding: 0.75rem !default $card-media-margin: $block-spacing !default .card background-color: $card-background-color + border-radius: $card-radius box-shadow: $card-shadow color: $card-color max-width: 100% position: relative +%card-item + &:first-child + border-top-left-radius: $card-radius + border-top-right-radius: $card-radius + &:last-child + border-bottom-left-radius: $card-radius + border-bottom-right-radius: $card-radius + .card-header + @extend %card-item background-color: $card-header-background-color align-items: stretch box-shadow: $card-header-shadow @@ -41,6 +54,7 @@ $card-media-margin: $block-spacing !default justify-content: center .card-header-icon + +reset align-items: center cursor: pointer display: flex @@ -50,12 +64,22 @@ $card-media-margin: $block-spacing !default .card-image display: block position: relative + &:first-child + img + border-top-left-radius: $card-radius + border-top-right-radius: $card-radius + &:last-child + img + border-bottom-left-radius: $card-radius + border-bottom-right-radius: $card-radius .card-content + @extend %card-item background-color: $card-content-background-color padding: $card-content-padding .card-footer + @extend %card-item background-color: $card-footer-background-color border-top: $card-footer-border-top align-items: stretch @@ -70,7 +94,7 @@ $card-media-margin: $block-spacing !default justify-content: center padding: $card-footer-padding &:not(:last-child) - border-right: $card-footer-border-top + +ltr-property("border", $card-footer-border-top) // Combinations diff --git a/themes/lhs/assets/sass/components/dropdown.sass b/themes/lhs/assets/sass/bulma/components/dropdown.sass similarity index 83% rename from themes/lhs/assets/sass/components/dropdown.sass rename to themes/lhs/assets/sass/bulma/components/dropdown.sass index b6146b0..3743cb7 100644 --- a/themes/lhs/assets/sass/components/dropdown.sass +++ b/themes/lhs/assets/sass/bulma/components/dropdown.sass @@ -1,21 +1,23 @@ +@import "../utilities/mixins" + $dropdown-menu-min-width: 12rem !default -$dropdown-content-background-color: $white !default +$dropdown-content-background-color: $scheme-main !default $dropdown-content-arrow: $link !default $dropdown-content-offset: 4px !default $dropdown-content-padding-bottom: 0.5rem !default $dropdown-content-padding-top: 0.5rem !default $dropdown-content-radius: $radius !default -$dropdown-content-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default +$dropdown-content-shadow: $shadow !default $dropdown-content-z: 20 !default -$dropdown-item-color: $grey-dark !default -$dropdown-item-hover-color: $black !default +$dropdown-item-color: $text !default +$dropdown-item-hover-color: $scheme-invert !default $dropdown-item-hover-background-color: $background !default $dropdown-item-active-color: $link-invert !default $dropdown-item-active-background-color: $link !default -$dropdown-divider-background-color: $border !default +$dropdown-divider-background-color: $border-light !default .dropdown display: inline-flex @@ -38,7 +40,7 @@ $dropdown-divider-background-color: $border !default .dropdown-menu display: none - left: 0 + +ltr-position(0, false) min-width: $dropdown-menu-min-width padding-top: $dropdown-content-offset position: absolute @@ -62,8 +64,8 @@ $dropdown-divider-background-color: $border !default a.dropdown-item, button.dropdown-item - padding-right: 3rem - text-align: left + +ltr-property("padding", 3rem) + text-align: inherit white-space: nowrap width: 100% &:hover diff --git a/themes/lhs/assets/sass/components/level.sass b/themes/lhs/assets/sass/bulma/components/level.sass similarity index 87% rename from themes/lhs/assets/sass/components/level.sass rename to themes/lhs/assets/sass/bulma/components/level.sass index 608f291..6793ae0 100644 --- a/themes/lhs/assets/sass/components/level.sass +++ b/themes/lhs/assets/sass/bulma/components/level.sass @@ -1,4 +1,6 @@ -$level-item-spacing: ($block-spacing / 2) !default +@import "../utilities/mixins" + +$level-item-spacing: ($block-spacing * 0.5) !default .level @extend %block @@ -20,7 +22,7 @@ $level-item-spacing: ($block-spacing / 2) !default .level-item &:not(:last-child) margin-bottom: 0 - margin-right: $level-item-spacing + +ltr-property("margin", $level-item-spacing) &:not(.is-narrow) flex-grow: 1 // Responsiveness @@ -57,7 +59,7 @@ $level-item-spacing: ($block-spacing / 2) !default // Responsiveness +tablet &:not(:last-child) - margin-right: $level-item-spacing + +ltr-property("margin", $level-item-spacing) .level-left align-items: center diff --git a/themes/lhs/assets/sass/bulma/components/media.sass b/themes/lhs/assets/sass/bulma/components/media.sass new file mode 100644 index 0000000..fc3f7d1 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/components/media.sass @@ -0,0 +1,59 @@ +@import "../utilities/mixins" + +$media-border-color: bulmaRgba($border, 0.5) !default +$media-border-size: 1px !default +$media-spacing: 1rem !default +$media-spacing-large: 1.5rem !default +$media-content-spacing: 0.75rem !default +$media-level-1-spacing: 0.75rem !default +$media-level-1-content-spacing: 0.5rem !default +$media-level-2-spacing: 0.5rem !default + +.media + align-items: flex-start + display: flex + text-align: inherit + .content:not(:last-child) + margin-bottom: $media-content-spacing + .media + border-top: $media-border-size solid $media-border-color + display: flex + padding-top: $media-level-1-spacing + .content:not(:last-child), + .control:not(:last-child) + margin-bottom: $media-level-1-content-spacing + .media + padding-top: $media-level-2-spacing + & + .media + margin-top: $media-level-2-spacing + & + .media + border-top: $media-border-size solid $media-border-color + margin-top: $media-spacing + padding-top: $media-spacing + // Sizes + &.is-large + & + .media + margin-top: $media-spacing-large + padding-top: $media-spacing-large + +.media-left, +.media-right + flex-basis: auto + flex-grow: 0 + flex-shrink: 0 + +.media-left + +ltr-property("margin", $media-spacing) + +.media-right + +ltr-property("margin", $media-spacing, false) + +.media-content + flex-basis: auto + flex-grow: 1 + flex-shrink: 1 + text-align: inherit + ++mobile + .media-content + overflow-x: auto diff --git a/themes/lhs/assets/sass/components/menu.sass b/themes/lhs/assets/sass/bulma/components/menu.sass similarity index 90% rename from themes/lhs/assets/sass/components/menu.sass rename to themes/lhs/assets/sass/bulma/components/menu.sass index 3de7e18..31dc56f 100644 --- a/themes/lhs/assets/sass/components/menu.sass +++ b/themes/lhs/assets/sass/bulma/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 @@ -42,9 +44,9 @@ $menu-label-spacing: 1em !default color: $menu-item-active-color li ul - border-left: $menu-list-border-left + +ltr-property("border", $menu-list-border-left, false) margin: $menu-nested-list-margin - padding-left: $menu-nested-list-padding-left + +ltr-property("padding", $menu-nested-list-padding-left, false) .menu-label color: $menu-label-color diff --git a/themes/lhs/assets/sass/components/message.sass b/themes/lhs/assets/sass/bulma/components/message.sass similarity index 70% rename from themes/lhs/assets/sass/components/message.sass rename to themes/lhs/assets/sass/bulma/components/message.sass index 2e626ad..ab83780 100644 --- a/themes/lhs/assets/sass/components/message.sass +++ b/themes/lhs/assets/sass/bulma/components/message.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $message-background-color: $background !default $message-radius: $radius !default @@ -13,7 +15,7 @@ $message-body-color: $text !default $message-body-padding: 1.25em 1.5em !default $message-body-radius: $radius !default -$message-body-pre-background-color: $white !default +$message-body-pre-background-color: $scheme-main !default $message-body-pre-code-background-color: transparent !default $message-header-body-border-width: 0 !default @@ -37,21 +39,33 @@ $message-colors: $colors !default &.is-large font-size: $size-large // Colors - @each $name, $pair in $message-colors - $color: nth($pair, 1) - $color-invert: nth($pair, 2) - $color-lightning: max((100% - lightness($color)) - 2%, 0%) - $color-luminance: colorLuminance($color) - $darken-percentage: $color-luminance * 70% - $desaturate-percentage: $color-luminance * 30% + @each $name, $components in $message-colors + $color: nth($components, 1) + $color-invert: nth($components, 2) + $color-light: null + $color-dark: null + + @if length($components) >= 3 + $color-light: nth($components, 3) + @if length($components) >= 4 + $color-dark: nth($components, 4) + @else + $color-luminance: colorLuminance($color) + $darken-percentage: $color-luminance * 70% + $desaturate-percentage: $color-luminance * 30% + $color-dark: desaturate(darken($color, $darken-percentage), $desaturate-percentage) + @else + $color-lightning: max((100% - lightness($color)) - 2%, 0%) + $color-light: lighten($color, $color-lightning) + &.is-#{$name} - background-color: lighten($color, $color-lightning) + background-color: $color-light .message-header background-color: $color color: $color-invert .message-body border-color: $color - color: desaturate(darken($color, $darken-percentage), $desaturate-percentage) + color: $color-dark .message-header align-items: center @@ -67,7 +81,7 @@ $message-colors: $colors !default .delete flex-grow: 0 flex-shrink: 0 - margin-left: 0.75em + +ltr-property("margin", 0.75em, false) & + .message-body border-width: $message-header-body-border-width border-top-left-radius: 0 diff --git a/themes/lhs/assets/sass/components/modal.sass b/themes/lhs/assets/sass/bulma/components/modal.sass similarity index 89% rename from themes/lhs/assets/sass/components/modal.sass rename to themes/lhs/assets/sass/bulma/components/modal.sass index c9d1979..fdbddd6 100644 --- a/themes/lhs/assets/sass/components/modal.sass +++ b/themes/lhs/assets/sass/bulma/components/modal.sass @@ -1,6 +1,8 @@ +@import "../utilities/mixins" + $modal-z: 40 !default -$modal-background-background-color: rgba($black, 0.86) !default +$modal-background-background-color: bulmaRgba($scheme-invert, 0.86) !default $modal-content-width: 640px !default $modal-content-margin-mobile: 20px !default @@ -25,9 +27,11 @@ $modal-card-title-size: $size-4 !default $modal-card-foot-radius: $radius-large !default $modal-card-foot-border-top: 1px solid $border !default -$modal-card-body-background-color: $white !default +$modal-card-body-background-color: $scheme-main !default $modal-card-body-padding: 20px !default +$modal-breakpoint: $tablet !default + .modal @extend %overlay align-items: center @@ -53,7 +57,7 @@ $modal-card-body-padding: 20px !default position: relative width: 100% // Responsiveness - +tablet + +from($modal-breakpoint) margin: 0 auto max-height: calc(100vh - #{$modal-content-spacing-tablet}) width: $modal-content-width @@ -63,7 +67,7 @@ $modal-card-body-padding: 20px !default background: none height: $modal-close-dimensions position: fixed - right: $modal-close-right + +ltr-position($modal-close-right) top: $modal-close-top width: $modal-close-dimensions @@ -102,7 +106,7 @@ $modal-card-body-padding: 20px !default border-top: $modal-card-foot-border-top .button &:not(:last-child) - margin-right: 0.5em + +ltr-property("margin", 0.5em) .modal-card-body +overflow-touch diff --git a/themes/lhs/assets/sass/components/navbar.sass b/themes/lhs/assets/sass/bulma/components/navbar.sass similarity index 88% rename from themes/lhs/assets/sass/components/navbar.sass rename to themes/lhs/assets/sass/bulma/components/navbar.sass index 7b97edb..f64c488 100644 --- a/themes/lhs/assets/sass/components/navbar.sass +++ b/themes/lhs/assets/sass/bulma/components/navbar.sass @@ -1,4 +1,6 @@ -$navbar-background-color: $white !default +@import "../utilities/mixins" + +$navbar-background-color: $scheme-main !default $navbar-box-shadow-size: 0 2px 0 0 !default $navbar-box-shadow-color: $background !default $navbar-height: 3.25rem !default @@ -7,10 +9,10 @@ $navbar-padding-horizontal: 2rem !default $navbar-z: 30 !default $navbar-fixed-z: 30 !default -$navbar-item-color: $grey-dark !default +$navbar-item-color: $text !default $navbar-item-hover-color: $link !default -$navbar-item-hover-background-color: $white-bis !default -$navbar-item-active-color: $black !default +$navbar-item-hover-background-color: $scheme-main-bis !default +$navbar-item-active-color: $scheme-invert !default $navbar-item-active-background-color: transparent !default $navbar-item-img-max-height: 1.75rem !default @@ -24,7 +26,7 @@ $navbar-tab-active-border-bottom-color: $link !default $navbar-tab-active-border-bottom-style: solid !default $navbar-tab-active-border-bottom-width: 3px !default -$navbar-dropdown-background-color: $white !default +$navbar-dropdown-background-color: $scheme-main !default $navbar-dropdown-border-top: 2px solid $border !default $navbar-dropdown-offset: -4px !default $navbar-dropdown-arrow: $link !default @@ -32,9 +34,9 @@ $navbar-dropdown-radius: $radius-large !default $navbar-dropdown-z: 20 !default $navbar-dropdown-boxed-radius: $radius-large !default -$navbar-dropdown-boxed-shadow: 0 8px 8px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default +$navbar-dropdown-boxed-shadow: 0 8px 8px bulmaRgba($scheme-invert, 0.1), 0 0 0 1px bulmaRgba($scheme-invert, 0.1) !default -$navbar-dropdown-item-hover-color: $black !default +$navbar-dropdown-item-hover-color: $scheme-invert !default $navbar-dropdown-item-hover-background-color: $background !default $navbar-dropdown-item-active-color: $link !default $navbar-dropdown-item-active-background-color: $background !default @@ -46,6 +48,8 @@ $navbar-bottom-box-shadow-size: 0 -2px 0 0 !default $navbar-breakpoint: $desktop !default +$navbar-colors: $colors !default + =navbar-fixed left: 0 position: fixed @@ -57,7 +61,7 @@ $navbar-breakpoint: $desktop !default min-height: $navbar-height position: relative z-index: $navbar-z - @each $name, $pair in $colors + @each $name, $pair in $navbar-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} @@ -72,7 +76,7 @@ $navbar-breakpoint: $desktop !default &:focus, &:hover, &.is-active - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) color: $color-invert .navbar-link &::after @@ -90,7 +94,7 @@ $navbar-breakpoint: $desktop !default &:focus, &:hover, &.is-active - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) color: $color-invert .navbar-link &::after @@ -98,7 +102,7 @@ $navbar-breakpoint: $desktop !default .navbar-item.has-dropdown:focus .navbar-link, .navbar-item.has-dropdown:hover .navbar-link, .navbar-item.has-dropdown.is-active .navbar-link - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) color: $color-invert .navbar-dropdown a.navbar-item @@ -149,9 +153,10 @@ body overflow-y: hidden .navbar-burger + @extend %reset color: $navbar-burger-color +hamburger($navbar-height) - margin-left: auto + +ltr-property("margin", auto, false) .navbar-menu display: none @@ -179,7 +184,6 @@ a.navbar-item, color: $navbar-item-hover-color .navbar-item - display: block flex-grow: 0 flex-shrink: 0 img @@ -210,12 +214,12 @@ a.navbar-item, flex-shrink: 1 .navbar-link:not(.is-arrowless) - padding-right: 2.5em + +ltr-property("padding", 2.5em) &::after @extend %arrow border-color: $navbar-dropdown-arrow margin-top: -0.375em - right: 1.125em + +ltr-position(1.125em) .navbar-dropdown font-size: 0.875rem @@ -245,7 +249,7 @@ a.navbar-item, display: none .navbar-menu background-color: $navbar-background-color - box-shadow: 0 8px 16px rgba($black, 0.1) + box-shadow: 0 8px 16px bulmaRgba($scheme-invert, 0.1) padding: 0.5rem 0 &.is-active display: block @@ -257,7 +261,7 @@ a.navbar-item, &.is-fixed-bottom-touch bottom: 0 &.has-shadow - box-shadow: 0 -2px 3px rgba($black, 0.1) + box-shadow: 0 -2px 3px bulmaRgba($scheme-invert, 0.1) &.is-fixed-top-touch top: 0 &.is-fixed-top, @@ -320,7 +324,6 @@ a.navbar-item, align-items: center display: flex .navbar-item - display: flex &.has-dropdown align-items: stretch &.has-dropdown-up @@ -331,7 +334,7 @@ a.navbar-item, border-radius: $navbar-dropdown-radius $navbar-dropdown-radius 0 0 border-top: none bottom: 100% - box-shadow: 0 -8px 8px rgba($black, 0.1) + box-shadow: 0 -8px 8px bulmaRgba($scheme-invert, 0.1) top: auto &.is-active, &.is-hoverable:focus, @@ -349,19 +352,19 @@ a.navbar-item, flex-shrink: 0 .navbar-start justify-content: flex-start - margin-right: auto + +ltr-property("margin", auto) .navbar-end justify-content: flex-end - margin-left: auto + +ltr-property("margin", auto, false) .navbar-dropdown background-color: $navbar-dropdown-background-color border-bottom-left-radius: $navbar-dropdown-radius border-bottom-right-radius: $navbar-dropdown-radius border-top: $navbar-dropdown-border-top - box-shadow: 0 8px 8px rgba($black, 0.1) + box-shadow: 0 8px 8px bulmaRgba($scheme-invert, 0.1) display: none font-size: 0.875rem - left: 0 + +ltr-position(0, false) min-width: 100% position: absolute top: 100% @@ -370,7 +373,7 @@ a.navbar-item, padding: 0.375rem 1rem white-space: nowrap a.navbar-item - padding-right: 3rem + +ltr-property("padding", 3rem) &:focus, &:hover background-color: $navbar-dropdown-item-hover-background-color @@ -398,9 +401,9 @@ a.navbar-item, .navbar > .container, .container > .navbar .navbar-brand - margin-left: -.75rem + +ltr-property("margin", -.75rem, false) .navbar-menu - margin-right: -.75rem + +ltr-property("margin", -.75rem) // Fixed navbar .navbar &.is-fixed-bottom-desktop, @@ -409,7 +412,7 @@ a.navbar-item, &.is-fixed-bottom-desktop bottom: 0 &.has-shadow - box-shadow: 0 -2px 3px rgba($black, 0.1) + box-shadow: 0 -2px 3px bulmaRgba($scheme-invert, 0.1) &.is-fixed-top-desktop top: 0 html, diff --git a/themes/lhs/assets/sass/components/pagination.sass b/themes/lhs/assets/sass/bulma/components/pagination.sass similarity index 80% rename from themes/lhs/assets/sass/components/pagination.sass rename to themes/lhs/assets/sass/bulma/components/pagination.sass index 634db96..950949d 100644 --- a/themes/lhs/assets/sass/components/pagination.sass +++ b/themes/lhs/assets/sass/bulma/components/pagination.sass @@ -1,5 +1,8 @@ -$pagination-color: $grey-darker !default -$pagination-border-color: $grey-lighter !default +@import "../utilities/controls" +@import "../utilities/mixins" + +$pagination-color: $text-strong !default +$pagination-border-color: $border !default $pagination-margin: -0.25rem !default $pagination-min-width: $control-height !default @@ -8,6 +11,9 @@ $pagination-item-margin: 0.25rem !default $pagination-item-padding-left: 0.5em !default $pagination-item-padding-right: 0.5em !default +$pagination-nav-padding-left: 0.75em !default +$pagination-nav-padding-right: 0.75em !default + $pagination-hover-color: $link-hover !default $pagination-hover-border-color: $link-hover-border !default @@ -17,9 +23,9 @@ $pagination-focus-border-color: $link-focus-border !default $pagination-active-color: $link-active !default $pagination-active-border-color: $link-active-border !default -$pagination-disabled-color: $grey !default -$pagination-disabled-background-color: $grey-lighter !default -$pagination-disabled-border-color: $grey-lighter !default +$pagination-disabled-color: $text-light !default +$pagination-disabled-background-color: $border !default +$pagination-disabled-border-color: $border !default $pagination-current-color: $link-invert !default $pagination-current-background-color: $link !default @@ -27,9 +33,10 @@ $pagination-current-border-color: $link !default $pagination-ellipsis-color: $grey-light !default -$pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2) +$pagination-shadow-inset: inset 0 1px 2px rgba($scheme-invert, 0.2) !default .pagination + @extend %block font-size: $size-normal margin: $pagination-margin // Sizes @@ -81,7 +88,8 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2) border-color: $pagination-focus-border-color &:active box-shadow: $pagination-shadow-inset - &[disabled] + &[disabled], + &.is-disabled background-color: $pagination-disabled-background-color border-color: $pagination-disabled-border-color box-shadow: none @@ -90,8 +98,8 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2) .pagination-previous, .pagination-next - padding-left: 0.75em - padding-right: 0.75em + padding-left: $pagination-nav-padding-left + padding-right: $pagination-nav-padding-right white-space: nowrap .pagination-link @@ -106,6 +114,8 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2) .pagination-list flex-wrap: wrap + li + list-style: none +mobile .pagination @@ -125,12 +135,20 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2) flex-shrink: 1 justify-content: flex-start order: 1 + .pagination-previous, + .pagination-next, + .pagination-link, + .pagination-ellipsis + margin-bottom: 0 + margin-top: 0 .pagination-previous order: 2 .pagination-next order: 3 .pagination justify-content: space-between + margin-bottom: 0 + margin-top: 0 &.is-centered .pagination-previous order: 1 diff --git a/themes/lhs/assets/sass/components/panel.sass b/themes/lhs/assets/sass/bulma/components/panel.sass similarity index 68% rename from themes/lhs/assets/sass/components/panel.sass rename to themes/lhs/assets/sass/bulma/components/panel.sass index 92d2ccc..afaffcd 100644 --- a/themes/lhs/assets/sass/components/panel.sass +++ b/themes/lhs/assets/sass/bulma/components/panel.sass @@ -1,13 +1,17 @@ -$panel-margin: $block-spacing !default -$panel-item-border: 1px solid $border !default +@import "../utilities/mixins" -$panel-heading-background-color: $background !default +$panel-margin: $block-spacing !default +$panel-item-border: 1px solid $border-light !default +$panel-radius: $radius-large !default +$panel-shadow: $shadow !default + +$panel-heading-background-color: $border-light !default $panel-heading-color: $text-strong !default $panel-heading-line-height: 1.25 !default -$panel-heading-padding: 0.5em 0.75em !default +$panel-heading-padding: 0.75em 1em !default $panel-heading-radius: $radius !default $panel-heading-size: 1.25em !default -$panel-heading-weight: $weight-light !default +$panel-heading-weight: $weight-bold !default $panel-tabs-font-size: 0.875em !default $panel-tab-border-bottom: 1px solid $border !default @@ -24,24 +28,35 @@ $panel-block-active-color: $link-active !default $panel-block-active-icon-color: $link !default $panel-icon-color: $text-light !default +$panel-colors: $colors !default .panel + border-radius: $panel-radius + box-shadow: $panel-shadow font-size: $size-normal &:not(:last-child) margin-bottom: $panel-margin + // Colors + @each $name, $components in $panel-colors + $color: nth($components, 1) + $color-invert: nth($components, 2) + &.is-#{$name} + .panel-heading + background-color: $color + color: $color-invert + .panel-tabs a.is-active + border-bottom-color: $color + .panel-block.is-active .panel-icon + color: $color -.panel-heading, .panel-tabs, .panel-block - border-bottom: $panel-item-border - border-left: $panel-item-border - border-right: $panel-item-border - &:first-child - border-top: $panel-item-border + &:not(:last-child) + border-bottom: $panel-item-border .panel-heading background-color: $panel-heading-background-color - border-radius: $panel-heading-radius $panel-heading-radius 0 0 + border-radius: $panel-radius $panel-radius 0 0 color: $panel-heading-color font-size: $panel-heading-size font-weight: $panel-heading-weight @@ -75,7 +90,7 @@ $panel-icon-color: $text-light !default justify-content: flex-start padding: 0.5em 0.75em input[type="checkbox"] - margin-right: 0.75em + +ltr-property("margin", 0.75em) & > .control flex-grow: 1 flex-shrink: 1 @@ -87,6 +102,9 @@ $panel-icon-color: $text-light !default color: $panel-block-active-color .panel-icon color: $panel-block-active-icon-color + &:last-child + border-bottom-left-radius: $panel-radius + border-bottom-right-radius: $panel-radius a.panel-block, label.panel-block @@ -97,7 +115,7 @@ label.panel-block .panel-icon +fa(14px, 1em) color: $panel-icon-color - margin-right: 0.75em + +ltr-property("margin", 0.75em) .fa font-size: inherit line-height: inherit diff --git a/themes/lhs/assets/sass/components/tabs.sass b/themes/lhs/assets/sass/bulma/components/tabs.sass similarity index 72% rename from themes/lhs/assets/sass/components/tabs.sass rename to themes/lhs/assets/sass/bulma/components/tabs.sass index 21ed90a..2cb6a54 100644 --- a/themes/lhs/assets/sass/components/tabs.sass +++ b/themes/lhs/assets/sass/bulma/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 @@ -12,7 +14,7 @@ $tabs-boxed-link-radius: $radius !default $tabs-boxed-link-hover-background-color: $background !default $tabs-boxed-link-hover-border-bottom-color: $border !default -$tabs-boxed-link-active-background-color: $white !default +$tabs-boxed-link-active-background-color: $scheme-main !default $tabs-boxed-link-active-border-color: $border !default $tabs-boxed-link-active-border-bottom-color: transparent !default @@ -78,9 +80,9 @@ $tabs-toggle-link-active-color: $link-invert !default padding-left: 0.75em .icon &:first-child - margin-right: 0.5em + +ltr-property("margin", 0.5em) &:last-child - margin-left: 0.5em + +ltr-property("margin", 0.5em, false) // Alignment &.is-centered ul @@ -92,7 +94,10 @@ $tabs-toggle-link-active-color: $link-invert !default &.is-boxed a border: 1px solid transparent - border-radius: $tabs-boxed-link-radius $tabs-boxed-link-radius 0 0 + +ltr + border-radius: $tabs-boxed-link-radius $tabs-boxed-link-radius 0 0 + +rtl + border-radius: 0 0 $tabs-boxed-link-radius $tabs-boxed-link-radius &:hover background-color: $tabs-boxed-link-hover-background-color border-bottom-color: $tabs-boxed-link-hover-border-bottom-color @@ -119,11 +124,21 @@ $tabs-toggle-link-active-color: $link-invert !default z-index: 2 li & + li - margin-left: -#{$tabs-toggle-link-border-width} + +ltr-property("margin", -#{$tabs-toggle-link-border-width}, false) &:first-child a - border-radius: $tabs-toggle-link-radius 0 0 $tabs-toggle-link-radius + +ltr + border-top-left-radius: $tabs-toggle-link-radius + border-bottom-left-radius: $tabs-toggle-link-radius + +rtl + border-top-right-radius: $tabs-toggle-link-radius + border-bottom-right-radius: $tabs-toggle-link-radius &:last-child a - border-radius: 0 $tabs-toggle-link-radius $tabs-toggle-link-radius 0 + +ltr + border-top-right-radius: $tabs-toggle-link-radius + border-bottom-right-radius: $tabs-toggle-link-radius + +rtl + border-top-left-radius: $tabs-toggle-link-radius + border-bottom-left-radius: $tabs-toggle-link-radius &.is-active a background-color: $tabs-toggle-link-active-background-color @@ -135,13 +150,23 @@ $tabs-toggle-link-active-color: $link-invert !default &.is-toggle-rounded li &:first-child a - border-bottom-left-radius: $radius-rounded - border-top-left-radius: $radius-rounded - padding-left: 1.25em + +ltr + border-bottom-left-radius: $radius-rounded + border-top-left-radius: $radius-rounded + padding-left: 1.25em + +rtl + border-bottom-right-radius: $radius-rounded + border-top-right-radius: $radius-rounded + padding-right: 1.25em &:last-child a - border-bottom-right-radius: $radius-rounded - border-top-right-radius: $radius-rounded - padding-right: 1.25em + +ltr + border-bottom-right-radius: $radius-rounded + border-top-right-radius: $radius-rounded + padding-right: 1.25em + +rtl + border-bottom-left-radius: $radius-rounded + border-top-left-radius: $radius-rounded + padding-left: 1.25em // Sizes &.is-small font-size: $size-small diff --git a/themes/lhs/assets/sass/bulma/elements/_all.sass b/themes/lhs/assets/sass/bulma/elements/_all.sass new file mode 100644 index 0000000..511047a --- /dev/null +++ b/themes/lhs/assets/sass/bulma/elements/_all.sass @@ -0,0 +1,16 @@ +/* Bulma Elements */ +@charset "utf-8" + +@import "box" +@import "button" +@import "container" +@import "content" +@import "icon" +@import "image" +@import "notification" +@import "progress" +@import "table" +@import "tag" +@import "title" + +@import "other" diff --git a/themes/lhs/assets/sass/elements/box.sass b/themes/lhs/assets/sass/bulma/elements/box.sass similarity index 57% rename from themes/lhs/assets/sass/elements/box.sass rename to themes/lhs/assets/sass/bulma/elements/box.sass index d58f405..8552430 100644 --- a/themes/lhs/assets/sass/elements/box.sass +++ b/themes/lhs/assets/sass/bulma/elements/box.sass @@ -1,11 +1,13 @@ +@import "../utilities/mixins" + $box-color: $text !default -$box-background-color: $white !default +$box-background-color: $scheme-main !default $box-radius: $radius-large !default -$box-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default +$box-shadow: $shadow !default $box-padding: 1.25rem !default -$box-link-hover-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px $link !default -$box-link-active-shadow: inset 0 1px 2px rgba($black, 0.2), 0 0 0 1px $link !default +$box-link-hover-shadow: 0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0 0 1px $link !default +$box-link-active-shadow: inset 0 1px 2px rgba($scheme-invert, 0.2), 0 0 0 1px $link !default .box @extend %block diff --git a/themes/lhs/assets/sass/elements/button.sass b/themes/lhs/assets/sass/bulma/elements/button.sass similarity index 66% rename from themes/lhs/assets/sass/elements/button.sass rename to themes/lhs/assets/sass/bulma/elements/button.sass index 5c5aca5..6308064 100644 --- a/themes/lhs/assets/sass/elements/button.sass +++ b/themes/lhs/assets/sass/bulma/elements/button.sass @@ -1,12 +1,15 @@ -$button-color: $grey-darker !default -$button-background-color: $white !default +@import "../utilities/controls" +@import "../utilities/mixins" + +$button-color: $text-strong !default +$button-background-color: $scheme-main !default $button-family: false !default -$button-border-color: $grey-lighter !default +$button-border-color: $border !default $button-border-width: $control-border-width !default -$button-padding-vertical: calc(0.375em - #{$button-border-width}) !default -$button-padding-horizontal: 0.75em !default +$button-padding-vertical: calc(0.5em - #{$button-border-width}) !default +$button-padding-horizontal: 1em !default $button-hover-color: $link-hover !default $button-hover-border-color: $link-hover-border !default @@ -14,27 +17,39 @@ $button-hover-border-color: $link-hover-border !default $button-focus-color: $link-focus !default $button-focus-border-color: $link-focus-border !default $button-focus-box-shadow-size: 0 0 0 0.125em !default -$button-focus-box-shadow-color: rgba($link, 0.25) !default +$button-focus-box-shadow-color: bulmaRgba($link, 0.25) !default $button-active-color: $link-active !default $button-active-border-color: $link-active-border !default $button-text-color: $text !default +$button-text-decoration: underline !default $button-text-hover-background-color: $background !default $button-text-hover-color: $text-strong !default -$button-disabled-background-color: $white !default -$button-disabled-border-color: $grey-lighter !default +$button-ghost-background: none !default +$button-ghost-border-color: transparent !default +$button-ghost-color: $link !default +$button-ghost-decoration: none !default +$button-ghost-hover-color: $link !default +$button-ghost-hover-decoration: underline !default + +$button-disabled-background-color: $scheme-main !default +$button-disabled-border-color: $border !default $button-disabled-shadow: none !default $button-disabled-opacity: 0.5 !default -$button-static-color: $grey !default -$button-static-background-color: $white-ter !default -$button-static-border-color: $grey-lighter !default +$button-static-color: $text-light !default +$button-static-background-color: $scheme-main-ter !default +$button-static-border-color: $border !default + +$button-colors: $colors !default +$button-responsive-sizes: ("mobile": ("small": ($size-small * 0.75), "normal": ($size-small * 0.875), "medium": $size-small, "large": $size-normal), "tablet-only": ("small": ($size-small * 0.875), "normal": ($size-small), "medium": $size-normal, "large": $size-medium)) !default // The button sizes use mixins so they can be used at different breakpoints =button-small - border-radius: $radius-small + &:not(.is-rounded) + border-radius: $radius-small font-size: $size-small =button-normal font-size: $size-normal @@ -70,14 +85,14 @@ $button-static-border-color: $grey-lighter !default height: 1.5em width: 1.5em &:first-child:not(:last-child) - margin-left: calc(-0.375em - #{$button-border-width}) - margin-right: 0.1875em + +ltr-property("margin", calc(#{-0.5 * $button-padding-horizontal} - #{$button-border-width}), false) + +ltr-property("margin", $button-padding-horizontal * 0.25) &:last-child:not(:first-child) - margin-left: 0.1875em - margin-right: calc(-0.375em - #{$button-border-width}) + +ltr-property("margin", $button-padding-horizontal * 0.25, false) + +ltr-property("margin", calc(#{-0.5 * $button-padding-horizontal} - #{$button-border-width})) &:first-child:last-child - margin-left: calc(-0.375em - #{$button-border-width}) - margin-right: calc(-0.375em - #{$button-border-width}) + margin-left: calc(#{-0.5 * $button-padding-horizontal} - #{$button-border-width}) + margin-right: calc(#{-0.5 * $button-padding-horizontal} - #{$button-border-width}) // States &:hover, &.is-hovered @@ -98,7 +113,7 @@ $button-static-border-color: $grey-lighter !default background-color: transparent border-color: transparent color: $button-text-color - text-decoration: underline + text-decoration: $button-text-decoration &:hover, &.is-hovered, &:focus, @@ -107,14 +122,23 @@ $button-static-border-color: $grey-lighter !default color: $button-text-hover-color &:active, &.is-active - background-color: darken($button-text-hover-background-color, 5%) + background-color: bulmaDarken($button-text-hover-background-color, 5%) color: $button-text-hover-color &[disabled], fieldset[disabled] & background-color: transparent border-color: transparent box-shadow: none - @each $name, $pair in $colors + &.is-ghost + background: $button-ghost-background + border-color: $button-ghost-border-color + color: $button-ghost-color + text-decoration: $button-ghost-decoration + &:hover, + &.is-hovered + color: $button-ghost-hover-color + text-decoration: $button-ghost-hover-decoration + @each $name, $pair in $button-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} @@ -123,7 +147,7 @@ $button-static-border-color: $grey-lighter !default color: $color-invert &:hover, &.is-hovered - background-color: darken($color, 2.5%) + background-color: bulmaDarken($color, 2.5%) border-color: transparent color: $color-invert &:focus, @@ -131,23 +155,23 @@ $button-static-border-color: $grey-lighter !default border-color: transparent color: $color-invert &:not(:active) - box-shadow: $button-focus-box-shadow-size rgba($color, 0.25) + box-shadow: $button-focus-box-shadow-size bulmaRgba($color, 0.25) &:active, &.is-active - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) border-color: transparent color: $color-invert &[disabled], fieldset[disabled] & background-color: $color - border-color: transparent + border-color: $color box-shadow: none &.is-inverted background-color: $color-invert color: $color &:hover, &.is-hovered - background-color: darken($color-invert, 5%) + background-color: bulmaDarken($color-invert, 5%) &[disabled], fieldset[disabled] & background-color: $color-invert @@ -206,6 +230,23 @@ $button-static-border-color: $grey-lighter !default border-color: $color-invert box-shadow: none color: $color-invert + // If light and dark colors are provided + @if length($pair) >= 4 + $color-light: nth($pair, 3) + $color-dark: nth($pair, 4) + &.is-light + background-color: $color-light + color: $color-dark + &:hover, + &.is-hovered + background-color: bulmaDarken($color-light, 2.5%) + border-color: transparent + color: $color-dark + &:active, + &.is-active + background-color: bulmaDarken($color-light, 5%) + border-color: transparent + color: $color-dark // Sizes &.is-small +button-small @@ -240,8 +281,8 @@ $button-static-border-color: $grey-lighter !default pointer-events: none &.is-rounded border-radius: $radius-rounded - padding-left: 1em - padding-right: 1em + padding-left: calc(#{$button-padding-horizontal} + 0.25em) + padding-right: calc(#{$button-padding-horizontal} + 0.25em) .buttons align-items: center @@ -251,7 +292,7 @@ $button-static-border-color: $grey-lighter !default .button margin-bottom: 0.5rem &:not(:last-child):not(.is-fullwidth) - margin-right: 0.5rem + +ltr-property("margin", 0.5rem) &:last-child margin-bottom: -0.5rem &:not(:last-child) @@ -274,9 +315,9 @@ $button-static-border-color: $grey-lighter !default &:not(:last-child) border-bottom-right-radius: 0 border-top-right-radius: 0 - margin-right: -1px + +ltr-property("margin", -1px) &:last-child - margin-right: 0 + +ltr-property("margin", 0) &:hover, &.is-hovered z-index: 2 @@ -303,3 +344,14 @@ $button-static-border-color: $grey-lighter !default .button:not(.is-fullwidth) margin-left: 0.25rem margin-right: 0.25rem + +@each $bp-name, $bp-sizes in $button-responsive-sizes + +breakpoint($bp-name) + @each $size, $value in $bp-sizes + @if $size != "normal" + .button.is-responsive.is-#{$size} + font-size: $value + @else + .button.is-responsive, + .button.is-responsive.is-normal + font-size: $value diff --git a/themes/lhs/assets/sass/bulma/elements/container.sass b/themes/lhs/assets/sass/bulma/elements/container.sass new file mode 100644 index 0000000..c13011e --- /dev/null +++ b/themes/lhs/assets/sass/bulma/elements/container.sass @@ -0,0 +1,29 @@ +@import "../utilities/mixins" + +$container-offset: (2 * $gap) !default +$container-max-width: $fullhd !default + +.container + flex-grow: 1 + margin: 0 auto + position: relative + width: auto + &.is-fluid + max-width: none !important + padding-left: $gap + padding-right: $gap + width: 100% + +desktop + max-width: $desktop - $container-offset + +until-widescreen + &.is-widescreen:not(.is-max-desktop) + max-width: min($widescreen, $container-max-width) - $container-offset + +until-fullhd + &.is-fullhd:not(.is-max-desktop):not(.is-max-widescreen) + max-width: min($fullhd, $container-max-width) - $container-offset + +widescreen + &:not(.is-max-desktop) + max-width: min($widescreen, $container-max-width) - $container-offset + +fullhd + &:not(.is-max-desktop):not(.is-max-widescreen) + max-width: min($fullhd, $container-max-width) - $container-offset diff --git a/themes/lhs/assets/sass/elements/content.sass b/themes/lhs/assets/sass/bulma/elements/content.sass similarity index 86% rename from themes/lhs/assets/sass/elements/content.sass rename to themes/lhs/assets/sass/bulma/elements/content.sass index 001419a..3f709ad 100644 --- a/themes/lhs/assets/sass/elements/content.sass +++ b/themes/lhs/assets/sass/bulma/elements/content.sass @@ -1,7 +1,11 @@ +@import "../utilities/mixins" + $content-heading-color: $text-strong !default $content-heading-weight: $weight-semibold !default $content-heading-line-height: 1.125 !default +$content-block-margin-bottom: 1em !default + $content-blockquote-background-color: $background !default $content-blockquote-border-left: 5px solid $border !default $content-blockquote-padding: 1.25em 1.5em !default @@ -14,6 +18,7 @@ $content-table-cell-padding: 0.5em 0.75em !default $content-table-cell-heading-color: $text-strong !default $content-table-head-cell-border-width: 0 0 2px !default $content-table-head-cell-color: $text-strong !default +$content-table-body-last-row-cell-border-bottom-width: 0 !default $content-table-foot-cell-border-width: 2px 0 0 !default $content-table-foot-cell-color: $text-strong !default @@ -31,7 +36,7 @@ $content-table-foot-cell-color: $text-strong !default pre, table &:not(:last-child) - margin-bottom: 1em + margin-bottom: $content-block-margin-bottom h1, h2, h3, @@ -67,11 +72,11 @@ $content-table-foot-cell-color: $text-strong !default margin-bottom: 1em blockquote background-color: $content-blockquote-background-color - border-left: $content-blockquote-border-left + +ltr-property("border", $content-blockquote-border-left, false) padding: $content-blockquote-padding ol list-style-position: outside - margin-left: 2em + +ltr-property("margin", 2em, false) margin-top: 1em &:not([type]) list-style-type: decimal @@ -85,7 +90,7 @@ $content-table-foot-cell-color: $text-strong !default list-style-type: upper-roman ul list-style: disc outside - margin-left: 2em + +ltr-property("margin", 2em, false) margin-top: 1em ul list-style-type: circle @@ -93,7 +98,7 @@ $content-table-foot-cell-color: $text-strong !default ul list-style-type: square dd - margin-left: 2em + +ltr-property("margin", 2em, false) figure margin-left: 2em margin-right: 2em @@ -126,7 +131,7 @@ $content-table-foot-cell-color: $text-strong !default th color: $content-table-cell-heading-color &:not([align]) - text-align: left + text-align: inherit thead td, th @@ -142,13 +147,15 @@ $content-table-foot-cell-color: $text-strong !default &:last-child td, th - border-bottom-width: 0 + border-bottom-width: $content-table-body-last-row-cell-border-bottom-width .tabs li + li margin-top: 0 // Sizes &.is-small font-size: $size-small + &.is-normal + font-size: $size-normal &.is-medium font-size: $size-medium &.is-large diff --git a/themes/lhs/assets/sass/elements/form.sass b/themes/lhs/assets/sass/bulma/elements/form.sass similarity index 100% rename from themes/lhs/assets/sass/elements/form.sass rename to themes/lhs/assets/sass/bulma/elements/form.sass diff --git a/themes/lhs/assets/sass/elements/icon.sass b/themes/lhs/assets/sass/bulma/elements/icon.sass similarity index 51% rename from themes/lhs/assets/sass/elements/icon.sass rename to themes/lhs/assets/sass/bulma/elements/icon.sass index 988546c..0befe2b 100644 --- a/themes/lhs/assets/sass/elements/icon.sass +++ b/themes/lhs/assets/sass/bulma/elements/icon.sass @@ -2,6 +2,7 @@ $icon-dimensions: 1.5rem !default $icon-dimensions-small: 1rem !default $icon-dimensions-medium: 2rem !default $icon-dimensions-large: 3rem !default +$icon-text-spacing: 0.25em !default .icon align-items: center @@ -19,3 +20,27 @@ $icon-dimensions-large: 3rem !default &.is-large height: $icon-dimensions-large width: $icon-dimensions-large + +.icon-text + align-items: flex-start + color: inherit + display: inline-flex + flex-wrap: wrap + line-height: $icon-dimensions + vertical-align: top + .icon + flex-grow: 0 + flex-shrink: 0 + &:not(:last-child) + +ltr + margin-right: $icon-text-spacing + +rtl + margin-left: $icon-text-spacing + &:not(:first-child) + +ltr + margin-left: $icon-text-spacing + +rtl + margin-right: $icon-text-spacing + +div.icon-text + display: flex diff --git a/themes/lhs/assets/sass/elements/image.sass b/themes/lhs/assets/sass/bulma/elements/image.sass similarity index 94% rename from themes/lhs/assets/sass/elements/image.sass rename to themes/lhs/assets/sass/bulma/elements/image.sass index cfa64fe..fc46541 100644 --- a/themes/lhs/assets/sass/elements/image.sass +++ b/themes/lhs/assets/sass/bulma/elements/image.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $dimensions: 16 24 32 48 64 96 128 !default .image @@ -9,6 +11,8 @@ $dimensions: 16 24 32 48 64 96 128 !default width: 100% &.is-rounded border-radius: $radius-rounded + &.is-fullwidth + width: 100% // Ratio &.is-square, &.is-1by1, diff --git a/themes/lhs/assets/sass/elements/notification.sass b/themes/lhs/assets/sass/bulma/elements/notification.sass similarity index 50% rename from themes/lhs/assets/sass/elements/notification.sass rename to themes/lhs/assets/sass/bulma/elements/notification.sass index 2bda414..f5c6021 100644 --- a/themes/lhs/assets/sass/elements/notification.sass +++ b/themes/lhs/assets/sass/bulma/elements/notification.sass @@ -1,13 +1,23 @@ +@import "../utilities/mixins" + $notification-background-color: $background !default +$notification-code-background-color: $scheme-main !default $notification-radius: $radius !default $notification-padding: 1.25rem 2.5rem 1.25rem 1.5rem !default +$notification-padding-ltr: 1.25rem 2.5rem 1.25rem 1.5rem !default +$notification-padding-rtl: 1.25rem 1.5rem 1.25rem 2.5rem !default + +$notification-colors: $colors !default .notification @extend %block background-color: $notification-background-color border-radius: $notification-radius - padding: $notification-padding position: relative + +ltr + padding: $notification-padding-ltr + +rtl + padding: $notification-padding-rtl a:not(.button):not(.dropdown-item) color: currentColor text-decoration: underline @@ -15,21 +25,28 @@ $notification-padding: 1.25rem 2.5rem 1.25rem 1.5rem !default color: currentColor code, pre - background: $white + background: $notification-code-background-color pre code background: transparent & > .delete + +ltr-position(0.5rem) position: absolute - right: 0.5rem top: 0.5rem .title, .subtitle, .content color: currentColor // Colors - @each $name, $pair in $colors + @each $name, $pair in $notification-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} background-color: $color color: $color-invert + // If light and dark colors are provided + @if length($pair) >= 4 + $color-light: nth($pair, 3) + $color-dark: nth($pair, 4) + &.is-light + background-color: $color-light + color: $color-dark diff --git a/themes/lhs/assets/sass/elements/other.sass b/themes/lhs/assets/sass/bulma/elements/other.sass similarity index 76% rename from themes/lhs/assets/sass/elements/other.sass rename to themes/lhs/assets/sass/bulma/elements/other.sass index 5725617..e83f361 100644 --- a/themes/lhs/assets/sass/elements/other.sass +++ b/themes/lhs/assets/sass/bulma/elements/other.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .block @extend %block @@ -11,16 +13,6 @@ margin-bottom: 5px text-transform: uppercase -.highlight - @extend %block - font-weight: $weight-normal - max-width: 100% - overflow: hidden - padding: 0 - pre - overflow: auto - max-width: 100% - .loader @extend %loader diff --git a/themes/lhs/assets/sass/elements/progress.sass b/themes/lhs/assets/sass/bulma/elements/progress.sass similarity index 89% rename from themes/lhs/assets/sass/elements/progress.sass rename to themes/lhs/assets/sass/bulma/elements/progress.sass index 08e2bcc..4daeb80 100644 --- a/themes/lhs/assets/sass/elements/progress.sass +++ b/themes/lhs/assets/sass/bulma/elements/progress.sass @@ -1,9 +1,13 @@ -$progress-bar-background-color: $border !default +@import "../utilities/mixins" + +$progress-bar-background-color: $border-light !default $progress-value-background-color: $text !default $progress-border-radius: $radius-rounded !default $progress-indeterminate-duration: 1.5s !default +$progress-colors: $colors !default + .progress @extend %block -moz-appearance: none @@ -25,7 +29,7 @@ $progress-indeterminate-duration: 1.5s !default background-color: $progress-value-background-color border: none // Colors - @each $name, $pair in $colors + @each $name, $pair in $progress-colors $color: nth($pair, 1) &.is-#{$name} &::-webkit-progress-value @@ -51,6 +55,8 @@ $progress-indeterminate-duration: 1.5s !default background-color: transparent &::-moz-progress-bar background-color: transparent + &::-ms-fill + animation-name: none // Sizes &.is-small diff --git a/themes/lhs/assets/sass/elements/table.sass b/themes/lhs/assets/sass/bulma/elements/table.sass similarity index 83% rename from themes/lhs/assets/sass/elements/table.sass rename to themes/lhs/assets/sass/bulma/elements/table.sass index d344a1f..f47d212 100644 --- a/themes/lhs/assets/sass/elements/table.sass +++ b/themes/lhs/assets/sass/bulma/elements/table.sass @@ -1,10 +1,13 @@ -$table-color: $grey-darker !default -$table-background-color: $white !default +@import "../utilities/mixins" -$table-cell-border: 1px solid $grey-lighter !default +$table-color: $text-strong !default +$table-background-color: $scheme-main !default + +$table-cell-border: 1px solid $border !default $table-cell-border-width: 0 0 1px !default $table-cell-padding: 0.5em 0.75em !default $table-cell-heading-color: $text-strong !default +$table-cell-text-align: left !default $table-head-cell-border-width: 0 0 2px !default $table-head-cell-color: $text-strong !default @@ -15,13 +18,15 @@ $table-head-background-color: transparent !default $table-body-background-color: transparent !default $table-foot-background-color: transparent !default -$table-row-hover-background-color: $white-bis !default +$table-row-hover-background-color: $scheme-main-bis !default $table-row-active-background-color: $primary !default $table-row-active-color: $primary-invert !default -$table-striped-row-even-background-color: $white-bis !default -$table-striped-row-even-hover-background-color: $white-ter !default +$table-striped-row-even-background-color: $scheme-main-bis !default +$table-striped-row-even-hover-background-color: $scheme-main-ter !default + +$table-colors: $colors !default .table @extend %block @@ -34,7 +39,7 @@ $table-striped-row-even-hover-background-color: $white-ter !default padding: $table-cell-padding vertical-align: top // Colors - @each $name, $pair in $colors + @each $name, $pair in $table-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} @@ -51,10 +56,12 @@ $table-striped-row-even-hover-background-color: $white-ter !default a, strong color: currentColor + &.is-vcentered + vertical-align: middle th color: $table-cell-heading-color &:not([align]) - text-align: left + text-align: $table-cell-text-align tr &.is-selected background-color: $table-row-active-background-color diff --git a/themes/lhs/assets/sass/elements/tag.sass b/themes/lhs/assets/sass/bulma/elements/tag.sass similarity index 65% rename from themes/lhs/assets/sass/elements/tag.sass rename to themes/lhs/assets/sass/bulma/elements/tag.sass index 7e7d077..392daee 100644 --- a/themes/lhs/assets/sass/elements/tag.sass +++ b/themes/lhs/assets/sass/bulma/elements/tag.sass @@ -1,8 +1,12 @@ +@import "../utilities/mixins" + $tag-background-color: $background !default $tag-color: $text !default $tag-radius: $radius !default $tag-delete-margin: 1px !default +$tag-colors: $colors !default + .tags align-items: center display: flex @@ -11,7 +15,7 @@ $tag-delete-margin: 1px !default .tag margin-bottom: 0.5rem &:not(:last-child) - margin-right: 0.5rem + +ltr-property("margin", 0.5rem) &:last-child margin-bottom: -0.5rem &:not(:last-child) @@ -37,14 +41,22 @@ $tag-delete-margin: 1px !default margin-right: 0 &.has-addons .tag - margin-right: 0 + +ltr-property("margin", 0) &:not(:first-child) - margin-left: 0 - border-bottom-left-radius: 0 - border-top-left-radius: 0 + +ltr-property("margin", 0, false) + +ltr + border-top-left-radius: 0 + border-bottom-left-radius: 0 + +rtl + border-top-right-radius: 0 + border-bottom-right-radius: 0 &:not(:last-child) - border-bottom-right-radius: 0 - border-top-right-radius: 0 + +ltr + border-top-right-radius: 0 + border-bottom-right-radius: 0 + +rtl + border-top-left-radius: 0 + border-bottom-left-radius: 0 .tag:not(body) align-items: center @@ -60,15 +72,22 @@ $tag-delete-margin: 1px !default padding-right: 0.75em white-space: nowrap .delete - margin-left: 0.25rem - margin-right: -0.375rem + +ltr-property("margin", 0.25rem, false) + +ltr-property("margin", -0.375rem) // Colors - @each $name, $pair in $colors + @each $name, $pair in $tag-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} background-color: $color color: $color-invert + // If a light and dark colors are provided + @if length($pair) > 3 + $color-light: nth($pair, 3) + $color-dark: nth($pair, 4) + &.is-light + background-color: $color-light + color: $color-dark // Sizes &.is-normal font-size: $size-small @@ -78,17 +97,17 @@ $tag-delete-margin: 1px !default font-size: $size-medium .icon &:first-child:not(:last-child) - margin-left: -0.375em - margin-right: 0.1875em + +ltr-property("margin", -0.375em, false) + +ltr-property("margin", 0.1875em) &:last-child:not(:first-child) - margin-left: 0.1875em - margin-right: -0.375em + +ltr-property("margin", 0.1875em, false) + +ltr-property("margin", -0.375em) &:first-child:last-child - margin-left: -0.375em - margin-right: -0.375em + +ltr-property("margin", -0.375em, false) + +ltr-property("margin", -0.375em) // Modifiers &.is-delete - margin-left: $tag-delete-margin + +ltr-property("margin", $tag-delete-margin, false) padding: 0 position: relative width: 2em diff --git a/themes/lhs/assets/sass/elements/title.sass b/themes/lhs/assets/sass/bulma/elements/title.sass similarity index 90% rename from themes/lhs/assets/sass/elements/title.sass rename to themes/lhs/assets/sass/bulma/elements/title.sass index a3db142..022420c 100644 --- a/themes/lhs/assets/sass/elements/title.sass +++ b/themes/lhs/assets/sass/bulma/elements/title.sass @@ -1,4 +1,6 @@ -$title-color: $grey-darker !default +@import "../utilities/mixins" + +$title-color: $text-strong !default $title-family: false !default $title-size: $size-3 !default $title-weight: $weight-semibold !default @@ -8,12 +10,12 @@ $title-strong-weight: inherit !default $title-sub-size: 0.75em !default $title-sup-size: 0.75em !default -$subtitle-color: $grey-dark !default +$subtitle-color: $text !default $subtitle-family: false !default $subtitle-size: $size-5 !default $subtitle-weight: $weight-normal !default $subtitle-line-height: 1.25 !default -$subtitle-strong-color: $grey-darker !default +$subtitle-strong-color: $text-strong !default $subtitle-strong-weight: $weight-semibold !default $subtitle-negative-margin: -1.25rem !default @@ -41,8 +43,6 @@ $subtitle-negative-margin: -1.25rem !default strong color: $title-strong-color font-weight: $title-strong-weight - & + .highlight - margin-top: -0.75rem &:not(.is-spaced) + .subtitle margin-top: $subtitle-negative-margin // Sizes diff --git a/themes/lhs/assets/sass/bulma/form/_all.sass b/themes/lhs/assets/sass/bulma/form/_all.sass new file mode 100644 index 0000000..0a15f80 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/form/_all.sass @@ -0,0 +1,9 @@ +/* Bulma Form */ +@charset "utf-8" + +@import "shared" +@import "input-textarea" +@import "checkbox-radio" +@import "select" +@import "file" +@import "tools" diff --git a/themes/lhs/assets/sass/form/checkbox-radio.sass b/themes/lhs/assets/sass/bulma/form/checkbox-radio.sass similarity index 79% rename from themes/lhs/assets/sass/form/checkbox-radio.sass rename to themes/lhs/assets/sass/bulma/form/checkbox-radio.sass index d9f3ff0..f033d11 100644 --- a/themes/lhs/assets/sass/form/checkbox-radio.sass +++ b/themes/lhs/assets/sass/bulma/form/checkbox-radio.sass @@ -8,7 +8,8 @@ &:hover color: $input-hover-color &[disabled], - fieldset[disabled] & + fieldset[disabled] &, + input[disabled] color: $input-disabled-color cursor: not-allowed @@ -18,4 +19,4 @@ .radio @extend %checkbox-radio & + .radio - margin-left: 0.5em + +ltr-property("margin", 0.5em, false) diff --git a/themes/lhs/assets/sass/form/file.sass b/themes/lhs/assets/sass/bulma/form/file.sass similarity index 81% rename from themes/lhs/assets/sass/form/file.sass rename to themes/lhs/assets/sass/bulma/form/file.sass index b50a42e..9b84c84 100644 --- a/themes/lhs/assets/sass/form/file.sass +++ b/themes/lhs/assets/sass/bulma/form/file.sass @@ -1,16 +1,18 @@ $file-border-color: $border !default $file-radius: $radius !default -$file-cta-background-color: $white-ter !default -$file-cta-color: $grey-dark !default -$file-cta-hover-color: $grey-darker !default -$file-cta-active-color: $grey-darker !default +$file-cta-background-color: $scheme-main-ter !default +$file-cta-color: $text !default +$file-cta-hover-color: $text-strong !default +$file-cta-active-color: $text-strong !default $file-name-border-color: $border !default $file-name-border-style: solid !default $file-name-border-width: 1px 1px 1px 0 !default $file-name-max-width: 16em !default +$file-colors: $form-colors !default + .file @extend %unselectable align-items: stretch @@ -18,7 +20,7 @@ $file-name-max-width: 16em !default justify-content: flex-start position: relative // Colors - @each $name, $pair in $colors + @each $name, $pair in $file-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} @@ -29,24 +31,26 @@ $file-name-max-width: 16em !default &:hover, &.is-hovered .file-cta - background-color: darken($color, 2.5%) + background-color: bulmaDarken($color, 2.5%) border-color: transparent color: $color-invert &:focus, &.is-focused .file-cta border-color: transparent - box-shadow: 0 0 0.5em rgba($color, 0.25) + box-shadow: 0 0 0.5em bulmaRgba($color, 0.25) color: $color-invert &:active, &.is-active .file-cta - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) border-color: transparent color: $color-invert // Sizes &.is-small font-size: $size-small + &.is-normal + font-size: $size-normal &.is-medium font-size: $size-medium .file-icon @@ -125,16 +129,16 @@ $file-name-max-width: 16em !default position: relative &:hover .file-cta - background-color: darken($file-cta-background-color, 2.5%) + background-color: bulmaDarken($file-cta-background-color, 2.5%) color: $file-cta-hover-color .file-name - border-color: darken($file-name-border-color, 2.5%) + border-color: bulmaDarken($file-name-border-color, 2.5%) &:active .file-cta - background-color: darken($file-cta-background-color, 5%) + background-color: bulmaDarken($file-cta-background-color, 5%) color: $file-cta-active-color .file-name - border-color: darken($file-name-border-color, 5%) + border-color: bulmaDarken($file-name-border-color, 5%) .file-input height: 100% @@ -166,7 +170,7 @@ $file-name-max-width: 16em !default display: block max-width: $file-name-max-width overflow: hidden - text-align: left + text-align: inherit text-overflow: ellipsis .file-icon @@ -174,7 +178,7 @@ $file-name-max-width: 16em !default display: flex height: 1em justify-content: center - margin-right: 0.5em + +ltr-property("margin", 0.5em) width: 1em .fa font-size: 14px diff --git a/themes/lhs/assets/sass/form/input-textarea.sass b/themes/lhs/assets/sass/bulma/form/input-textarea.sass similarity index 64% rename from themes/lhs/assets/sass/form/input-textarea.sass rename to themes/lhs/assets/sass/bulma/form/input-textarea.sass index da4315c..8d842a0 100644 --- a/themes/lhs/assets/sass/form/input-textarea.sass +++ b/themes/lhs/assets/sass/bulma/form/input-textarea.sass @@ -1,3 +1,9 @@ +$textarea-padding: $control-padding-horizontal !default +$textarea-max-height: 40em !default +$textarea-min-height: 8em !default + +$textarea-colors: $form-colors !default + %input-textarea @extend %input box-shadow: $input-shadow @@ -6,7 +12,7 @@ &[readonly] box-shadow: none // Colors - @each $name, $pair in $colors + @each $name, $pair in $textarea-colors $color: nth($pair, 1) &.is-#{$name} border-color: $color @@ -14,7 +20,7 @@ &.is-focused, &:active, &.is-active - box-shadow: $input-focus-box-shadow-size rgba($color, 0.25) + box-shadow: $input-focus-box-shadow-size bulmaRgba($color, 0.25) // Sizes &.is-small +control-small @@ -34,8 +40,8 @@ @extend %input-textarea &.is-rounded border-radius: $radius-rounded - padding-left: 1em - padding-right: 1em + padding-left: calc(#{$control-padding-horizontal} + 0.375em) + padding-right: calc(#{$control-padding-horizontal} + 0.375em) &.is-static background-color: transparent border-color: transparent @@ -48,11 +54,11 @@ display: block max-width: 100% min-width: 100% - padding: 0.625em + padding: $textarea-padding resize: vertical &:not([rows]) - max-height: 600px - min-height: 120px + max-height: $textarea-max-height + min-height: $textarea-min-height &[rows] height: initial // Modifiers diff --git a/themes/lhs/assets/sass/form/select.sass b/themes/lhs/assets/sass/bulma/form/select.sass similarity index 79% rename from themes/lhs/assets/sass/form/select.sass rename to themes/lhs/assets/sass/bulma/form/select.sass index 909b9d5..951b735 100644 --- a/themes/lhs/assets/sass/form/select.sass +++ b/themes/lhs/assets/sass/bulma/form/select.sass @@ -1,3 +1,5 @@ +$select-colors: $form-colors !default + .select display: inline-block max-width: 100% @@ -9,12 +11,12 @@ &::after @extend %arrow border-color: $input-arrow - right: 1.125em + +ltr-position(1.125em) z-index: 4 &.is-rounded select border-radius: $radius-rounded - padding-left: 1em + +ltr-property("padding", 1em, false) select @extend %input cursor: pointer @@ -28,7 +30,7 @@ fieldset[disabled] &:hover border-color: $input-disabled-border-color &:not([multiple]) - padding-right: 2.5em + +ltr-property("padding", 2.5em) &[multiple] height: auto padding: 0 @@ -39,7 +41,7 @@ &::after border-color: $input-hover-color // Colors - @each $name, $pair in $colors + @each $name, $pair in $select-colors $color: nth($pair, 1) &.is-#{$name} &:not(:hover)::after @@ -48,12 +50,12 @@ border-color: $color &:hover, &.is-hovered - border-color: darken($color, 5%) + border-color: bulmaDarken($color, 5%) &:focus, &.is-focused, &:active, &.is-active - box-shadow: $input-focus-box-shadow-size rgba($color, 0.25) + box-shadow: $input-focus-box-shadow-size bulmaRgba($color, 0.25) // Sizes &.is-small +control-small @@ -64,7 +66,8 @@ // Modifiers &.is-disabled &::after - border-color: $input-disabled-color + border-color: $input-disabled-color !important + opacity: 0.5 &.is-fullwidth width: 100% select @@ -74,7 +77,7 @@ @extend %loader margin-top: 0 position: absolute - right: 0.625em + +ltr-position(0.625em) top: 0.625em transform: none &.is-small:after diff --git a/themes/lhs/assets/sass/form/shared.sass b/themes/lhs/assets/sass/bulma/form/shared.sass similarity index 60% rename from themes/lhs/assets/sass/form/shared.sass rename to themes/lhs/assets/sass/bulma/form/shared.sass index d391955..422d7aa 100644 --- a/themes/lhs/assets/sass/form/shared.sass +++ b/themes/lhs/assets/sass/bulma/form/shared.sass @@ -1,27 +1,32 @@ -$input-color: $grey-darker !default -$input-background-color: $white !default -$input-border-color: $grey-lighter !default +@import "../utilities/controls" +@import "../utilities/mixins" + +$form-colors: $colors !default + +$input-color: $text-strong !default +$input-background-color: $scheme-main !default +$input-border-color: $border !default $input-height: $control-height !default -$input-shadow: inset 0 1px 2px rgba($black, 0.1) !default -$input-placeholder-color: rgba($input-color, 0.3) !default +$input-shadow: inset 0 0.0625em 0.125em rgba($scheme-invert, 0.05) !default +$input-placeholder-color: bulmaRgba($input-color, 0.3) !default -$input-hover-color: $grey-darker !default -$input-hover-border-color: $grey-light !default +$input-hover-color: $text-strong !default +$input-hover-border-color: $border-hover !default -$input-focus-color: $grey-darker !default +$input-focus-color: $text-strong !default $input-focus-border-color: $link !default $input-focus-box-shadow-size: 0 0 0 0.125em !default -$input-focus-box-shadow-color: rgba($link, 0.25) !default +$input-focus-box-shadow-color: bulmaRgba($link, 0.25) !default $input-disabled-color: $text-light !default $input-disabled-background-color: $background !default $input-disabled-border-color: $background !default -$input-disabled-placeholder-color: rgba($input-disabled-color, 0.3) !default +$input-disabled-placeholder-color: bulmaRgba($input-disabled-color, 0.3) !default $input-arrow: $link !default -$input-icon-color: $grey-lighter !default -$input-icon-active-color: $grey !default +$input-icon-color: $border !default +$input-icon-active-color: $text !default $input-radius: $radius !default diff --git a/themes/lhs/assets/sass/form/tools.sass b/themes/lhs/assets/sass/bulma/form/tools.sass similarity index 85% rename from themes/lhs/assets/sass/form/tools.sass rename to themes/lhs/assets/sass/bulma/form/tools.sass index 32ee141..73b09b6 100644 --- a/themes/lhs/assets/sass/form/tools.sass +++ b/themes/lhs/assets/sass/bulma/form/tools.sass @@ -1,8 +1,10 @@ -$label-color: $grey-darker !default +$label-color: $text-strong !default $label-weight: $weight-bold !default $help-size: $size-small !default +$label-colors: $form-colors !default + .label color: $label-color display: block @@ -22,7 +24,7 @@ $help-size: $size-small !default display: block font-size: $help-size margin-top: 0.25rem - @each $name, $pair in $colors + @each $name, $pair in $label-colors $color: nth($pair, 1) &.is-#{$name} color: $color @@ -38,7 +40,7 @@ $help-size: $size-small !default justify-content: flex-start .control &:not(:last-child) - margin-right: -1px + +ltr-property("margin", -1px) &:not(:first-child):not(:last-child) .button, .input, @@ -48,14 +50,22 @@ $help-size: $size-small !default .button, .input, .select select - border-bottom-right-radius: 0 - border-top-right-radius: 0 + +ltr + border-bottom-right-radius: 0 + border-top-right-radius: 0 + +rtl + border-bottom-left-radius: 0 + border-top-left-radius: 0 &:last-child:not(:only-child) .button, .input, .select select - border-bottom-left-radius: 0 - border-top-left-radius: 0 + +ltr + border-bottom-left-radius: 0 + border-top-left-radius: 0 + +rtl + border-bottom-right-radius: 0 + border-top-right-radius: 0 .button, .input, .select select @@ -88,7 +98,7 @@ $help-size: $size-small !default flex-shrink: 0 &:not(:last-child) margin-bottom: 0 - margin-right: 0.75rem + +ltr-property("margin", 0.75rem) &.is-expanded flex-grow: 1 flex-shrink: 1 @@ -119,7 +129,7 @@ $help-size: $size-small !default flex-basis: 0 flex-grow: 1 flex-shrink: 0 - margin-right: 1.5rem + +ltr-property("margin", 1.5rem) text-align: right &.is-small font-size: $size-small @@ -148,14 +158,14 @@ $help-size: $size-small !default &:not(.is-narrow) flex-grow: 1 &:not(:last-child) - margin-right: 0.75rem + +ltr-property("margin", 0.75rem) .control box-sizing: border-box clear: both font-size: $size-normal position: relative - text-align: left + text-align: inherit // Modifiers &.has-icons-left, &.has-icons-right @@ -194,7 +204,7 @@ $help-size: $size-small !default &::after @extend %loader position: absolute !important - right: 0.625em + +ltr-position(0.625em) top: 0.625em z-index: 4 &.is-small:after diff --git a/themes/lhs/assets/sass/bulma/grid/_all.sass b/themes/lhs/assets/sass/bulma/grid/_all.sass new file mode 100644 index 0000000..0b5ed31 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/grid/_all.sass @@ -0,0 +1,5 @@ +/* Bulma Grid */ +@charset "utf-8" + +@import "columns" +@import "tiles" diff --git a/themes/lhs/assets/sass/grid/columns.sass b/themes/lhs/assets/sass/bulma/grid/columns.sass similarity index 72% rename from themes/lhs/assets/sass/grid/columns.sass rename to themes/lhs/assets/sass/bulma/grid/columns.sass index 34a8353..e66112b 100644 --- a/themes/lhs/assets/sass/grid/columns.sass +++ b/themes/lhs/assets/sass/bulma/grid/columns.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $column-gap: 0.75rem !default .column @@ -8,6 +10,7 @@ $column-gap: 0.75rem !default padding: $column-gap .columns.is-mobile > &.is-narrow flex: none + width: unset .columns.is-mobile > &.is-full flex: none width: 100% @@ -39,32 +42,33 @@ $column-gap: 0.75rem !default flex: none width: 80% .columns.is-mobile > &.is-offset-three-quarters - margin-left: 75% + +ltr-property("margin", 75%, false) .columns.is-mobile > &.is-offset-two-thirds - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) .columns.is-mobile > &.is-offset-half - margin-left: 50% + +ltr-property("margin", 50%, false) .columns.is-mobile > &.is-offset-one-third - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) .columns.is-mobile > &.is-offset-one-quarter - margin-left: 25% + +ltr-property("margin", 25%, false) .columns.is-mobile > &.is-offset-one-fifth - margin-left: 20% + +ltr-property("margin", 20%, false) .columns.is-mobile > &.is-offset-two-fifths - margin-left: 40% + +ltr-property("margin", 40%, false) .columns.is-mobile > &.is-offset-three-fifths - margin-left: 60% + +ltr-property("margin", 60%, false) .columns.is-mobile > &.is-offset-four-fifths - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 .columns.is-mobile > &.is-#{$i} flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) .columns.is-mobile > &.is-offset-#{$i} - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +mobile &.is-narrow-mobile flex: none + width: unset &.is-full-mobile flex: none width: 100% @@ -96,33 +100,34 @@ $column-gap: 0.75rem !default flex: none width: 80% &.is-offset-three-quarters-mobile - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds-mobile - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half-mobile - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third-mobile - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter-mobile - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth-mobile - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths-mobile - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths-mobile - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths-mobile - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}-mobile flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}-mobile - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +tablet &.is-narrow, &.is-narrow-tablet flex: none + width: unset &.is-full, &.is-full-tablet flex: none @@ -165,42 +170,43 @@ $column-gap: 0.75rem !default width: 80% &.is-offset-three-quarters, &.is-offset-three-quarters-tablet - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds, &.is-offset-two-thirds-tablet - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half, &.is-offset-half-tablet - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third, &.is-offset-one-third-tablet - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter, &.is-offset-one-quarter-tablet - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth, &.is-offset-one-fifth-tablet - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths, &.is-offset-two-fifths-tablet - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths, &.is-offset-three-fifths-tablet - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths, &.is-offset-four-fifths-tablet - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}, &.is-#{$i}-tablet flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}, &.is-offset-#{$i}-tablet - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +touch &.is-narrow-touch flex: none + width: unset &.is-full-touch flex: none width: 100% @@ -232,32 +238,33 @@ $column-gap: 0.75rem !default flex: none width: 80% &.is-offset-three-quarters-touch - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds-touch - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half-touch - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third-touch - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter-touch - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth-touch - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths-touch - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths-touch - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths-touch - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}-touch flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}-touch - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +desktop &.is-narrow-desktop flex: none + width: unset &.is-full-desktop flex: none width: 100% @@ -289,32 +296,33 @@ $column-gap: 0.75rem !default flex: none width: 80% &.is-offset-three-quarters-desktop - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds-desktop - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half-desktop - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third-desktop - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter-desktop - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth-desktop - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths-desktop - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths-desktop - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths-desktop - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}-desktop flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}-desktop - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +widescreen &.is-narrow-widescreen flex: none + width: unset &.is-full-widescreen flex: none width: 100% @@ -346,32 +354,33 @@ $column-gap: 0.75rem !default flex: none width: 80% &.is-offset-three-quarters-widescreen - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds-widescreen - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half-widescreen - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third-widescreen - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter-widescreen - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth-widescreen - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths-widescreen - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths-widescreen - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths-widescreen - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}-widescreen flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}-widescreen - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) +fullhd &.is-narrow-fullhd flex: none + width: unset &.is-full-fullhd flex: none width: 100% @@ -403,33 +412,33 @@ $column-gap: 0.75rem !default flex: none width: 80% &.is-offset-three-quarters-fullhd - margin-left: 75% + +ltr-property("margin", 75%, false) &.is-offset-two-thirds-fullhd - margin-left: 66.6666% + +ltr-property("margin", 66.6666%, false) &.is-offset-half-fullhd - margin-left: 50% + +ltr-property("margin", 50%, false) &.is-offset-one-third-fullhd - margin-left: 33.3333% + +ltr-property("margin", 33.3333%, false) &.is-offset-one-quarter-fullhd - margin-left: 25% + +ltr-property("margin", 25%, false) &.is-offset-one-fifth-fullhd - margin-left: 20% + +ltr-property("margin", 20%, false) &.is-offset-two-fifths-fullhd - margin-left: 40% + +ltr-property("margin", 40%, false) &.is-offset-three-fifths-fullhd - margin-left: 60% + +ltr-property("margin", 60%, false) &.is-offset-four-fifths-fullhd - margin-left: 80% + +ltr-property("margin", 80%, false) @for $i from 0 through 12 &.is-#{$i}-fullhd flex: none - width: percentage($i / 12) + width: percentage(divide($i, 12)) &.is-offset-#{$i}-fullhd - margin-left: percentage($i / 12) + +ltr-property("margin", percentage(divide($i, 12)), false) .columns - margin-left: (-$column-gap) - margin-right: (-$column-gap) + +ltr-property("margin", (-$column-gap), false) + +ltr-property("margin", (-$column-gap)) margin-top: (-$column-gap) &:last-child margin-bottom: (-$column-gap) @@ -439,8 +448,8 @@ $column-gap: 0.75rem !default &.is-centered justify-content: center &.is-gapless - margin-left: 0 - margin-right: 0 + +ltr-property("margin", 0, false) + +ltr-property("margin", 0) margin-top: 0 & > .column margin: 0 @@ -467,9 +476,9 @@ $column-gap: 0.75rem !default @if $variable-columns .columns.is-variable --columnGap: 0.75rem - margin-left: calc(-1 * var(--columnGap)) - margin-right: calc(-1 * var(--columnGap)) - .column + +ltr-property("margin", calc(-1 * var(--columnGap)), false) + +ltr-property("margin", calc(-1 * var(--columnGap))) + > .column padding-left: var(--columnGap) padding-right: var(--columnGap) @for $i from 0 through 8 diff --git a/themes/lhs/assets/sass/grid/tiles.sass b/themes/lhs/assets/sass/bulma/grid/tiles.sass similarity index 91% rename from themes/lhs/assets/sass/grid/tiles.sass rename to themes/lhs/assets/sass/bulma/grid/tiles.sass index 15648c2..d22d738 100644 --- a/themes/lhs/assets/sass/grid/tiles.sass +++ b/themes/lhs/assets/sass/bulma/grid/tiles.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + $tile-spacing: 0.75rem !default .tile @@ -31,4 +33,4 @@ $tile-spacing: 0.75rem !default @for $i from 1 through 12 &.is-#{$i} flex: none - width: ($i / 12) * 100% + width: (divide($i, 12)) * 100% diff --git a/themes/lhs/assets/sass/bulma/helpers/_all.sass b/themes/lhs/assets/sass/bulma/helpers/_all.sass new file mode 100644 index 0000000..d673da6 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/helpers/_all.sass @@ -0,0 +1,12 @@ +/* Bulma Helpers */ +@charset "utf-8" + +@import "color" +@import "flexbox" +@import "float" +@import "other" +@import "overflow" +@import "position" +@import "spacing" +@import "typography" +@import "visibility" diff --git a/themes/lhs/assets/sass/helpers/color.sass b/themes/lhs/assets/sass/bulma/helpers/color.sass similarity index 96% rename from themes/lhs/assets/sass/helpers/color.sass rename to themes/lhs/assets/sass/bulma/helpers/color.sass index 22ac8c5..b7a8a50 100644 --- a/themes/lhs/assets/sass/helpers/color.sass +++ b/themes/lhs/assets/sass/bulma/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/themes/lhs/assets/sass/helpers/flexbox.sass b/themes/lhs/assets/sass/bulma/helpers/flexbox.sass similarity index 100% rename from themes/lhs/assets/sass/helpers/flexbox.sass rename to themes/lhs/assets/sass/bulma/helpers/flexbox.sass diff --git a/themes/lhs/assets/sass/helpers/float.sass b/themes/lhs/assets/sass/bulma/helpers/float.sass similarity index 78% rename from themes/lhs/assets/sass/helpers/float.sass rename to themes/lhs/assets/sass/bulma/helpers/float.sass index fc77f17..f62f24e 100644 --- a/themes/lhs/assets/sass/helpers/float.sass +++ b/themes/lhs/assets/sass/bulma/helpers/float.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-clearfix +clearfix diff --git a/themes/lhs/assets/sass/helpers/other.sass b/themes/lhs/assets/sass/bulma/helpers/other.sass similarity index 73% rename from themes/lhs/assets/sass/helpers/other.sass rename to themes/lhs/assets/sass/bulma/helpers/other.sass index e8bb93d..6e2e63c 100644 --- a/themes/lhs/assets/sass/helpers/other.sass +++ b/themes/lhs/assets/sass/bulma/helpers/other.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-radiusless border-radius: 0 !important @@ -6,6 +8,7 @@ .is-clickable cursor: pointer !important + pointer-events: all !important .is-unselectable @extend %unselectable diff --git a/themes/lhs/assets/sass/helpers/overflow.sass b/themes/lhs/assets/sass/bulma/helpers/overflow.sass similarity index 100% rename from themes/lhs/assets/sass/helpers/overflow.sass rename to themes/lhs/assets/sass/bulma/helpers/overflow.sass diff --git a/themes/lhs/assets/sass/helpers/position.sass b/themes/lhs/assets/sass/bulma/helpers/position.sass similarity index 71% rename from themes/lhs/assets/sass/helpers/position.sass rename to themes/lhs/assets/sass/bulma/helpers/position.sass index 083b36b..4b8fda4 100644 --- a/themes/lhs/assets/sass/helpers/position.sass +++ b/themes/lhs/assets/sass/bulma/helpers/position.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + .is-overlay @extend %overlay diff --git a/themes/lhs/assets/sass/helpers/spacing.sass b/themes/lhs/assets/sass/bulma/helpers/spacing.sass similarity index 94% rename from themes/lhs/assets/sass/helpers/spacing.sass rename to themes/lhs/assets/sass/bulma/helpers/spacing.sass index b9bb19b..0237c73 100644 --- a/themes/lhs/assets/sass/helpers/spacing.sass +++ b/themes/lhs/assets/sass/bulma/helpers/spacing.sass @@ -8,7 +8,7 @@ $spacing-shortcuts: ("margin": "m", "padding": "p") !default $spacing-directions: ("top": "t", "right": "r", "bottom": "b", "left": "l") !default $spacing-horizontal: "x" !default $spacing-vertical: "y" !default -$spacing-values: ("0": 0, "1": 0.25rem, "2": 0.5rem, "3": 0.75rem, "4": 1rem, "5": 1.5rem, "6": 3rem) !default +$spacing-values: ("0": 0, "1": 0.25rem, "2": 0.5rem, "3": 0.75rem, "4": 1rem, "5": 1.5rem, "6": 3rem, "auto": auto) !default @each $property, $shortcut in $spacing-shortcuts @each $name, $value in $spacing-values diff --git a/themes/lhs/assets/sass/helpers/typography.sass b/themes/lhs/assets/sass/bulma/helpers/typography.sass similarity index 96% rename from themes/lhs/assets/sass/helpers/typography.sass rename to themes/lhs/assets/sass/bulma/helpers/typography.sass index eafd7e0..dceca77 100644 --- a/themes/lhs/assets/sass/helpers/typography.sass +++ b/themes/lhs/assets/sass/bulma/helpers/typography.sass @@ -1,3 +1,5 @@ +@import "../utilities/mixins" + =typography-size($target:'') @each $size in $sizes $i: index($sizes, $size) @@ -70,6 +72,9 @@ $alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'rig .is-italic font-style: italic !important + +.is-underlined + text-decoration: underline !important .has-text-weight-light font-weight: $weight-light !important diff --git a/themes/lhs/assets/sass/helpers/visibility.sass b/themes/lhs/assets/sass/bulma/helpers/visibility.sass similarity index 98% rename from themes/lhs/assets/sass/helpers/visibility.sass rename to themes/lhs/assets/sass/bulma/helpers/visibility.sass index 92477f3..a1bb0d5 100644 --- a/themes/lhs/assets/sass/helpers/visibility.sass +++ b/themes/lhs/assets/sass/bulma/helpers/visibility.sass @@ -1,4 +1,4 @@ - +@import "../utilities/mixins" $displays: 'block' 'flex' 'inline' 'inline-block' 'inline-flex' diff --git a/themes/lhs/assets/sass/bulma/layout/_all.sass b/themes/lhs/assets/sass/bulma/layout/_all.sass new file mode 100644 index 0000000..4d1df5b --- /dev/null +++ b/themes/lhs/assets/sass/bulma/layout/_all.sass @@ -0,0 +1,6 @@ +/* Bulma Layout */ +@charset "utf-8" + +@import "hero" +@import "section" +@import "footer" diff --git a/themes/lhs/assets/sass/layout/footer.sass b/themes/lhs/assets/sass/bulma/layout/footer.sass similarity index 67% rename from themes/lhs/assets/sass/layout/footer.sass rename to themes/lhs/assets/sass/bulma/layout/footer.sass index aba1eca..4e9187e 100644 --- a/themes/lhs/assets/sass/layout/footer.sass +++ b/themes/lhs/assets/sass/bulma/layout/footer.sass @@ -1,4 +1,6 @@ -$footer-background-color: $white-bis !default +@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/themes/lhs/assets/sass/layout/hero.sass b/themes/lhs/assets/sass/bulma/layout/hero.sass similarity index 64% rename from themes/lhs/assets/sass/layout/hero.sass rename to themes/lhs/assets/sass/bulma/layout/hero.sass index 327d80f..bd2312c 100644 --- a/themes/lhs/assets/sass/layout/hero.sass +++ b/themes/lhs/assets/sass/bulma/layout/hero.sass @@ -1,5 +1,14 @@ -// Main container +@import "../utilities/mixins" +$hero-body-padding: 3rem 1.5rem !default +$hero-body-padding-tablet: 3rem 3rem !default +$hero-body-padding-small: 1.5rem !default +$hero-body-padding-medium: 9rem 4.5rem !default +$hero-body-padding-large: 18rem 6rem !default + +$hero-colors: $colors !default + +// Main container .hero align-items: stretch display: flex @@ -11,7 +20,7 @@ ul border-bottom: none // Colors - @each $name, $pair in $colors + @each $name, $pair in $hero-colors $color: nth($pair, 1) $color-invert: nth($pair, 2) &.is-#{$name} @@ -23,7 +32,7 @@ .title color: $color-invert .subtitle - color: rgba($color-invert, 0.9) + color: bulmaRgba($color-invert, 0.9) a:not(.button), strong color: $color-invert @@ -32,12 +41,12 @@ background-color: $color .navbar-item, .navbar-link - color: rgba($color-invert, 0.7) + color: bulmaRgba($color-invert, 0.7) a.navbar-item, .navbar-link &:hover, &.is-active - background-color: darken($color, 5%) + background-color: bulmaDarken($color, 5%) color: $color-invert .tabs a @@ -47,13 +56,14 @@ opacity: 1 li &.is-active a + color: $color !important opacity: 1 &.is-boxed, &.is-toggle a color: $color-invert &:hover - background-color: rgba($black, 0.1) + background-color: bulmaRgba($scheme-invert, 0.1) li.is-active a &, &:hover @@ -61,28 +71,26 @@ border-color: $color-invert color: $color // Modifiers - &.is-bold - $gradient-top-left: darken(saturate(adjust-hue($color, -10deg), 10%), 10%) - $gradient-bottom-right: lighten(saturate(adjust-hue($color, 10deg), 5%), 5%) - background-image: linear-gradient(141deg, $gradient-top-left 0%, $color 71%, $gradient-bottom-right 100%) - +mobile - .navbar-menu - background-image: linear-gradient(141deg, $gradient-top-left 0%, $color 71%, $gradient-bottom-right 100%) + @if type-of($color) == 'color' + &.is-bold + $gradient-top-left: darken(saturate(adjust-hue($color, -10deg), 10%), 10%) + $gradient-bottom-right: lighten(saturate(adjust-hue($color, 10deg), 5%), 5%) + background-image: linear-gradient(141deg, $gradient-top-left 0%, $color 71%, $gradient-bottom-right 100%) + +mobile + .navbar-menu + background-image: linear-gradient(141deg, $gradient-top-left 0%, $color 71%, $gradient-bottom-right 100%) // Sizes &.is-small .hero-body - padding-bottom: 1.5rem - padding-top: 1.5rem + padding: $hero-body-padding-small &.is-medium +tablet .hero-body - padding-bottom: 9rem - padding-top: 9rem + padding: $hero-body-padding-medium &.is-large +tablet .hero-body - padding-bottom: 18rem - padding-top: 18rem + padding: $hero-body-padding-large &.is-halfheight, &.is-fullheight, &.is-fullheight-with-navbar @@ -128,7 +136,7 @@ display: flex justify-content: center .button:not(:last-child) - margin-right: 1.5rem + +ltr-property("margin", 1.5rem) // Containers @@ -140,4 +148,6 @@ .hero-body flex-grow: 1 flex-shrink: 0 - padding: 3rem 1.5rem + padding: $hero-body-padding + +tablet + padding: $hero-body-padding-tablet diff --git a/themes/lhs/assets/sass/layout/section.sass b/themes/lhs/assets/sass/bulma/layout/section.sass similarity index 52% rename from themes/lhs/assets/sass/layout/section.sass rename to themes/lhs/assets/sass/bulma/layout/section.sass index 6f2d352..9c5a9f4 100644 --- a/themes/lhs/assets/sass/layout/section.sass +++ b/themes/lhs/assets/sass/bulma/layout/section.sass @@ -1,11 +1,15 @@ +@import "../utilities/mixins" + $section-padding: 3rem 1.5rem !default -$section-padding-medium: 9rem 1.5rem !default -$section-padding-large: 18rem 1.5rem !default +$section-padding-desktop: 3rem 3rem !default +$section-padding-medium: 9rem 4.5rem !default +$section-padding-large: 18rem 6rem !default .section padding: $section-padding // Responsiveness +desktop + padding: $section-padding-desktop // Sizes &.is-medium padding: $section-padding-medium diff --git a/themes/lhs/assets/sass/bulma/utilities/_all.sass b/themes/lhs/assets/sass/bulma/utilities/_all.sass new file mode 100644 index 0000000..51cf348 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/utilities/_all.sass @@ -0,0 +1,9 @@ +/* Bulma Utilities */ +@charset "utf-8" + +@import "initial-variables" +@import "functions" +@import "derived-variables" +@import "mixins" +@import "controls" +@import "extends" diff --git a/themes/lhs/assets/sass/bulma/utilities/animations.sass b/themes/lhs/assets/sass/bulma/utilities/animations.sass new file mode 100644 index 0000000..1872e08 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/utilities/animations.sass @@ -0,0 +1 @@ +@warn "The animations.sass file has MOVED. It is now in the /base folder. Please import sass/base/animations instead." diff --git a/themes/lhs/assets/sass/utilities/controls.sass b/themes/lhs/assets/sass/bulma/utilities/controls.sass similarity index 83% rename from themes/lhs/assets/sass/utilities/controls.sass rename to themes/lhs/assets/sass/bulma/utilities/controls.sass index 7ca0521..4c738c7 100644 --- a/themes/lhs/assets/sass/utilities/controls.sass +++ b/themes/lhs/assets/sass/bulma/utilities/controls.sass @@ -1,13 +1,15 @@ +@import "derived-variables" + $control-radius: $radius !default $control-radius-small: $radius-small !default $control-border-width: 1px !default -$control-height: 2.25em !default +$control-height: 2.5em !default $control-line-height: 1.5 !default -$control-padding-vertical: calc(0.375em - #{$control-border-width}) !default -$control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default +$control-padding-vertical: calc(0.5em - #{$control-border-width}) !default +$control-padding-horizontal: calc(0.75em - #{$control-border-width}) !default =control -moz-appearance: none @@ -37,9 +39,6 @@ $control-padding-horizontal: calc(0.625em - #{$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/themes/lhs/assets/sass/utilities/derived-variables.sass b/themes/lhs/assets/sass/bulma/utilities/derived-variables.sass similarity index 52% rename from themes/lhs/assets/sass/utilities/derived-variables.sass rename to themes/lhs/assets/sass/bulma/utilities/derived-variables.sass index c464814..cefc8f1 100644 --- a/themes/lhs/assets/sass/utilities/derived-variables.sass +++ b/themes/lhs/assets/sass/bulma/utilities/derived-variables.sass @@ -1,3 +1,6 @@ +@import "initial-variables" +@import "functions" + $primary: $turquoise !default $info: $cyan !default @@ -19,20 +22,39 @@ $blue-invert: findColorInvert($blue) !default $purple-invert: findColorInvert($purple) !default $red-invert: findColorInvert($red) !default -$primary-invert: $turquoise-invert !default -$info-invert: $cyan-invert !default -$success-invert: $green-invert !default -$warning-invert: $yellow-invert !default -$danger-invert: $red-invert !default -$light-invert: $dark !default -$dark-invert: $light !default +$primary-invert: findColorInvert($primary) !default +$primary-light: findLightColor($primary) !default +$primary-dark: findDarkColor($primary) !default +$info-invert: findColorInvert($info) !default +$info-light: findLightColor($info) !default +$info-dark: findDarkColor($info) !default +$success-invert: findColorInvert($success) !default +$success-light: findLightColor($success) !default +$success-dark: findDarkColor($success) !default +$warning-invert: findColorInvert($warning) !default +$warning-light: findLightColor($warning) !default +$warning-dark: findDarkColor($warning) !default +$danger-invert: findColorInvert($danger) !default +$danger-light: findLightColor($danger) !default +$danger-dark: findDarkColor($danger) !default +$light-invert: findColorInvert($light) !default +$dark-invert: findColorInvert($dark) !default // General colors +$scheme-main: $white !default +$scheme-main-bis: $white-bis !default +$scheme-main-ter: $white-ter !default +$scheme-invert: $black !default +$scheme-invert-bis: $black-bis !default +$scheme-invert-ter: $black-ter !default + $background: $white-ter !default $border: $grey-lighter !default $border-hover: $grey-light !default +$border-light: $grey-lightest !default +$border-light-hover: $grey-light !default // Text colors @@ -43,7 +65,7 @@ $text-strong: $grey-darker !default // Code colors -$code: $red !default +$code: darken($red, 15%) !default $code-background: $background !default $pre: $text !default @@ -52,7 +74,9 @@ $pre-background: $background !default // Link colors $link: $blue !default -$link-invert: $blue-invert !default +$link-invert: findColorInvert($link) !default +$link-light: findLightColor($link) !default +$link-dark: findDarkColor($link) !default $link-visited: $purple !default $link-hover: $grey-darker !default @@ -75,11 +99,16 @@ $size-normal: $size-6 !default $size-medium: $size-5 !default $size-large: $size-4 !default +// Effects + +$shadow: 0 0.5em 1em -0.125em rgba($scheme-invert, 0.1), 0 0px 0 1px rgba($scheme-invert, 0.02) !default + // Lists and maps $custom-colors: null !default $custom-shades: null !default -$colors: mergeColorMaps(("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert), "link": ($link, $link-invert), "info": ($info, $info-invert), "success": ($success, $success-invert), "warning": ($warning, $warning-invert), "danger": ($danger, $danger-invert)), $custom-colors) !default +$colors: mergeColorMaps(("white": ($white, $black), "black": ($black, $white), "light": ($light, $light-invert), "dark": ($dark, $dark-invert), "primary": ($primary, $primary-invert, $primary-light, $primary-dark), "link": ($link, $link-invert, $link-light, $link-dark), "info": ($info, $info-invert, $info-light, $info-dark), "success": ($success, $success-invert, $success-light, $success-dark), "warning": ($warning, $warning-invert, $warning-light, $warning-dark), "danger": ($danger, $danger-invert, $danger-light, $danger-dark)), $custom-colors) !default + $shades: mergeColorMaps(("black-bis": $black-bis, "black-ter": $black-ter, "grey-darker": $grey-darker, "grey-dark": $grey-dark, "grey": $grey, "grey-light": $grey-light, "grey-lighter": $grey-lighter, "white-ter": $white-ter, "white-bis": $white-bis), $custom-shades) !default $sizes: $size-1 $size-2 $size-3 $size-4 $size-5 $size-6 $size-7 !default diff --git a/themes/lhs/assets/sass/bulma/utilities/extends.sass b/themes/lhs/assets/sass/bulma/utilities/extends.sass new file mode 100644 index 0000000..c994fc1 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/utilities/extends.sass @@ -0,0 +1,25 @@ +@import "mixins" + +%control + +control + +%unselectable + +unselectable + +%arrow + +arrow + +%block + +block + +%delete + +delete + +%loader + +loader + +%overlay + +overlay + +%reset + +reset diff --git a/themes/lhs/assets/sass/bulma/utilities/functions.sass b/themes/lhs/assets/sass/bulma/utilities/functions.sass new file mode 100644 index 0000000..eeea6f2 --- /dev/null +++ b/themes/lhs/assets/sass/bulma/utilities/functions.sass @@ -0,0 +1,135 @@ +@function mergeColorMaps($bulma-colors, $custom-colors) + // We return at least Bulma's hard-coded colors + $merged-colors: $bulma-colors + + // We want a map as input + @if type-of($custom-colors) == 'map' + @each $name, $components in $custom-colors + // The color name should be a string + // and the components either a single color + // or a colors list with at least one element + @if type-of($name) == 'string' and (type-of($components) == 'list' or type-of($components) == 'color') and length($components) >= 1 + $color-base: null + $color-invert: null + $color-light: null + $color-dark: null + $value: null + + // The param can either be a single color + // or a list of 2 colors + @if type-of($components) == 'color' + $color-base: $components + $color-invert: findColorInvert($color-base) + $color-light: findLightColor($color-base) + $color-dark: findDarkColor($color-base) + @else if type-of($components) == 'list' + $color-base: nth($components, 1) + // If Invert, Light and Dark are provided + @if length($components) > 3 + $color-invert: nth($components, 2) + $color-light: nth($components, 3) + $color-dark: nth($components, 4) + // If only Invert and Light are provided + @else if length($components) > 2 + $color-invert: nth($components, 2) + $color-light: nth($components, 3) + $color-dark: findDarkColor($color-base) + // If only Invert is provided + @else + $color-invert: nth($components, 2) + $color-light: findLightColor($color-base) + $color-dark: findDarkColor($color-base) + + $value: ($color-base, $color-invert, $color-light, $color-dark) + + // We only want to merge the map if the color base is an actual color + @if type-of($color-base) == 'color' + // We merge this colors elements as map with Bulma's colors map + // (we can override them this way, no multiple definition for the same name) + // $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert, $color-light, $color-dark))) + $merged-colors: map_merge($merged-colors, ($name: $value)) + + @return $merged-colors + +@function powerNumber($number, $exp) + $value: 1 + @if $exp > 0 + @for $i from 1 through $exp + $value: $value * $number + @else if $exp < 0 + @for $i from 1 through -$exp + $value: divide($value, $number) + @return $value + +@function colorLuminance($color) + @if type-of($color) != 'color' + @return 0.55 + $color-rgb: ('red': red($color),'green': green($color),'blue': blue($color)) + @each $name, $value in $color-rgb + $adjusted: 0 + $value: divide($value, 255) + @if $value < 0.03928 + $value: divide($value, 12.92) + @else + $value: divide(($value + .055), 1.055) + $value: powerNumber($value, 2) + $color-rgb: map-merge($color-rgb, ($name: $value)) + @return (map-get($color-rgb, 'red') * .2126) + (map-get($color-rgb, 'green') * .7152) + (map-get($color-rgb, 'blue') * .0722) + +@function findColorInvert($color) + @if (colorLuminance($color) > 0.55) + @return rgba(#000, 0.7) + @else + @return #fff + +@function findLightColor($color, $l: 96%) + @if type-of($color) == 'color' + $l: 96% + @if lightness($color) > 96% + $l: lightness($color) + @return change-color($color, $lightness: $l) + @return $background + +@function findDarkColor($color, $base-l: 29%) + @if type-of($color) == 'color' + $luminance: colorLuminance($color) + $luminance-delta: (0.53 - $luminance) + $target-l: round($base-l + ($luminance-delta * 53)) + @return change-color($color, $lightness: max($base-l, $target-l)) + @return $text-strong + +@function bulmaRgba($color, $alpha) + @if type-of($color) != 'color' + @return $color + @return rgba($color, $alpha) + +@function bulmaDarken($color, $amount) + @if type-of($color) != 'color' + @return $color + @return darken($color, $amount) + +@function bulmaLighten($color, $amount) + @if type-of($color) != 'color' + @return $color + @return lighten($color, $amount) + +// Custom divide function by @mdo from https://github.com/twbs/bootstrap/pull/34245 +// Replaces old slash division deprecated in Dart Sass +@function divide($dividend, $divisor, $precision: 10) + $sign: if($dividend > 0 and $divisor > 0, 1, -1) + $dividend: abs($dividend) + $divisor: abs($divisor) + $quotient: 0 + $remainder: $dividend + @if $dividend == 0 + @return 0 + @if $divisor == 0 + @error "Cannot divide by 0" + @if $divisor == 1 + @return $dividend + @while $remainder >= $divisor + $quotient: $quotient + 1 + $remainder: $remainder - $divisor + @if $remainder > 0 and $precision > 0 + $remainder: divide($remainder * 10, $divisor, $precision - 1) * .1 + @return ($quotient + $remainder) * $sign diff --git a/themes/lhs/assets/sass/utilities/initial-variables.sass b/themes/lhs/assets/sass/bulma/utilities/initial-variables.sass similarity index 63% rename from themes/lhs/assets/sass/utilities/initial-variables.sass rename to themes/lhs/assets/sass/bulma/utilities/initial-variables.sass index 8b96f84..3c2d282 100644 --- a/themes/lhs/assets/sass/utilities/initial-variables.sass +++ b/themes/lhs/assets/sass/bulma/utilities/initial-variables.sass @@ -9,23 +9,24 @@ $grey-dark: hsl(0, 0%, 29%) !default $grey: hsl(0, 0%, 48%) !default $grey-light: hsl(0, 0%, 71%) !default $grey-lighter: hsl(0, 0%, 86%) !default +$grey-lightest: hsl(0, 0%, 93%) !default $white-ter: hsl(0, 0%, 96%) !default $white-bis: hsl(0, 0%, 98%) !default $white: hsl(0, 0%, 100%) !default $orange: hsl(14, 100%, 53%) !default -$yellow: hsl(48, 100%, 67%) !default -$green: hsl(141, 71%, 48%) !default +$yellow: hsl(44, 100%, 77%) !default +$green: hsl(153, 53%, 53%) !default $turquoise: hsl(171, 100%, 41%) !default -$cyan: hsl(204, 86%, 53%) !default -$blue: hsl(217, 71%, 53%) !default +$cyan: hsl(207, 61%, 53%) !default +$blue: hsl(229, 53%, 53%) !default $purple: hsl(271, 100%, 71%) !default -$red: hsl(348, 100%, 61%) !default +$red: hsl(348, 86%, 61%) !default // Typography -$family-sans-serif: 'Roboto' , sans-serif !default +$family-sans-serif: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif !default $family-monospace: monospace !default $render-mode: optimizeLegibility !default @@ -61,6 +62,7 @@ $widescreen-enabled: true !default // 1344px container + 4rem $fullhd: 1344px + (2 * $gap) !default $fullhd-enabled: true !default +$breakpoints: ("mobile": ("until": $tablet), "tablet": ("from": $tablet), "tablet-only": ("from": $tablet, "until": $desktop), "touch": ("from": $desktop), "desktop": ("from": $desktop), "desktop-only": ("from": $desktop, "until": $widescreen), "until-widescreen": ("until": $widescreen), "widescreen": ("from": $widescreen), "widescreen-only": ("from": $widescreen, "until": $fullhd), "until-fullhd": ("until": $fullhd), "fullhd": ("from": $fullhd)) !default // Miscellaneous @@ -68,9 +70,10 @@ $easing: ease-out !default $radius-small: 2px !default $radius: 4px !default $radius-large: 6px !default -$radius-rounded: 290486px !default +$radius-rounded: 9999px !default $speed: 86ms !default // Flags $variable-columns: true !default +$rtl: false !default diff --git a/themes/lhs/assets/sass/utilities/mixins.sass b/themes/lhs/assets/sass/bulma/utilities/mixins.sass similarity index 73% rename from themes/lhs/assets/sass/utilities/mixins.sass rename to themes/lhs/assets/sass/bulma/utilities/mixins.sass index e95abd0..10cbae3 100644 --- a/themes/lhs/assets/sass/utilities/mixins.sass +++ b/themes/lhs/assets/sass/bulma/utilities/mixins.sass @@ -1,4 +1,4 @@ -@import "initial-variables" +@import "derived-variables" =clearfix &::after @@ -9,11 +9,11 @@ =center($width, $height: 0) position: absolute @if $height != 0 - left: calc(50% - (#{$width} / 2)) - top: calc(50% - (#{$height} / 2)) + left: calc(50% - (#{$width} * 0.5)) + top: calc(50% - (#{$height} * 0.5)) @else - left: calc(50% - (#{$width} / 2)) - top: calc(50% - (#{$width} / 2)) + left: calc(50% - (#{$width} * 0.5)) + top: calc(50% - (#{$width} * 0.5)) =fa($size, $dimensions) display: inline-block @@ -25,6 +25,11 @@ width: $dimensions =hamburger($dimensions) + -moz-appearance: none + -webkit-appearance: none + appearance: none + background: none + border: none cursor: pointer display: block height: $dimensions @@ -48,7 +53,7 @@ &:nth-child(3) top: calc(50% + 4px) &:hover - background-color: rgba(black, 0.05) + background-color: bulmaRgba(black, 0.05) // Modifers &.is-active span @@ -68,6 +73,18 @@ &:#{$placeholder}-placeholder @content +=reset + -moz-appearance: none + -webkit-appearance: none + appearance: none + background: none + border: none + color: currentColor + font-family: inherit + font-size: 1em + margin: 0 + padding: 0 + // Responsiveness =from($device) @@ -78,6 +95,10 @@ @media screen and (max-width: $device - 1px) @content +=between($from, $until) + @media screen and (min-width: $from) and (max-width: $until - 1px) + @content + =mobile @media screen and (max-width: $tablet - 1px) @content @@ -128,6 +149,45 @@ @media screen and (min-width: $fullhd) @content +=breakpoint($name) + $breakpoint: map-get($breakpoints, $name) + @if $breakpoint + $from: map-get($breakpoint, "from") + $until: map-get($breakpoint, "until") + @if $from and $until + +between($from, $until) + @content + @else if $from + +from($from) + @content + @else if $until + +until($until) + @content + +=ltr + @if not $rtl + @content + +=rtl + @if $rtl + @content + +=ltr-property($property, $spacing, $right: true) + $normal: if($right, "right", "left") + $opposite: if($right, "left", "right") + @if $rtl + #{$property}-#{$opposite}: $spacing + @else + #{$property}-#{$normal}: $spacing + +=ltr-position($spacing, $right: true) + $normal: if($right, "right", "left") + $opposite: if($right, "left", "right") + @if $rtl + #{$opposite}: $spacing + @else + #{$normal}: $spacing + // Placeholders =unselectable @@ -137,9 +197,6 @@ -ms-user-select: none user-select: none -%unselectable - +unselectable - =arrow($color: transparent) border: 3px solid $color border-radius: 2px @@ -156,21 +213,15 @@ 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: rgba($black, 0.2) + background-color: bulmaRgba($scheme-invert, 0.2) border: none border-radius: $radius-rounded cursor: pointer @@ -190,7 +241,7 @@ width: 20px &::before, &::after - background-color: $white + background-color: $scheme-main content: "" display: block left: 50% @@ -206,9 +257,9 @@ width: 2px &:hover, &:focus - background-color: rgba($black, 0.3) + background-color: bulmaRgba($scheme-invert, 0.3) &:active - background-color: rgba($black, 0.4) + background-color: bulmaRgba($scheme-invert, 0.4) // Sizes &.is-small height: 16px @@ -232,9 +283,6 @@ min-width: 32px width: 32px -%delete - +delete - =loader animation: spinAround 500ms infinite linear border: 2px solid $grey-lighter @@ -247,15 +295,9 @@ position: relative width: 1em -%loader - +loader - =overlay($offset: 0) bottom: $offset left: $offset position: absolute right: $offset top: $offset - -%overlay - +overlay diff --git a/themes/lhs/assets/sass/components/_all.sass b/themes/lhs/assets/sass/components/_all.sass deleted file mode 100644 index 88fd45c..0000000 --- a/themes/lhs/assets/sass/components/_all.sass +++ /dev/null @@ -1,15 +0,0 @@ -@charset "utf-8" - -@import "breadcrumb.sass" -@import "card.sass" -@import "dropdown.sass" -@import "level.sass" -@import "list.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" diff --git a/themes/lhs/assets/sass/components/list.sass b/themes/lhs/assets/sass/components/list.sass deleted file mode 100644 index e09b551..0000000 --- a/themes/lhs/assets/sass/components/list.sass +++ /dev/null @@ -1,39 +0,0 @@ -$list-background-color: $white !default -$list-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default -$list-radius: $radius !default - -$list-item-border: 1px solid $border !default -$list-item-color: $text !default -$list-item-active-background-color: $link !default -$list-item-active-color: $link-invert !default -$list-item-hover-background-color: $background !default - -.list - @extend %block - background-color: $list-background-color - border-radius: $list-radius - box-shadow: $list-shadow - // &.is-hoverable > .list-item:hover:not(.is-active) - // background-color: $list-item-hover-background-color - // cursor: pointer - -.list-item - display: block - padding: 0.5em 1em - &:not(a) - color: $list-item-color - &:first-child - border-top-left-radius: $list-radius - border-top-right-radius: $list-radius - &:last-child - border-bottom-left-radius: $list-radius - border-bottom-right-radius: $list-radius - &:not(:last-child) - border-bottom: $list-item-border - &.is-active - background-color: $list-item-active-background-color - color: $list-item-active-color - -a.list-item - background-color: $list-item-hover-background-color - cursor: pointer diff --git a/themes/lhs/assets/sass/components/media.sass b/themes/lhs/assets/sass/components/media.sass deleted file mode 100644 index e8542d8..0000000 --- a/themes/lhs/assets/sass/components/media.sass +++ /dev/null @@ -1,48 +0,0 @@ -.media - align-items: flex-start - display: flex - text-align: left - .content:not(:last-child) - margin-bottom: 0.75rem - .media - border-top: 1px solid rgba($border, 0.5) - display: flex - padding-top: 0.75rem - .content:not(:last-child), - .control:not(:last-child) - margin-bottom: 0.5rem - .media - padding-top: 0.5rem - & + .media - margin-top: 0.5rem - & + .media - border-top: 1px solid rgba($border, 0.5) - margin-top: 1rem - padding-top: 1rem - // Sizes - &.is-large - & + .media - margin-top: 1.5rem - padding-top: 1.5rem - -.media-left, -.media-right - flex-basis: auto - flex-grow: 0 - flex-shrink: 0 - -.media-left - margin-right: 1rem - -.media-right - margin-left: 1rem - -.media-content - flex-basis: auto - flex-grow: 1 - flex-shrink: 1 - text-align: left - -+mobile - .media-content - overflow-x: auto diff --git a/themes/lhs/assets/sass/elements/_all.sass b/themes/lhs/assets/sass/elements/_all.sass deleted file mode 100644 index 7490c00..0000000 --- a/themes/lhs/assets/sass/elements/_all.sass +++ /dev/null @@ -1,15 +0,0 @@ -@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 "other.sass" diff --git a/themes/lhs/assets/sass/elements/container.sass b/themes/lhs/assets/sass/elements/container.sass deleted file mode 100644 index c69a993..0000000 --- a/themes/lhs/assets/sass/elements/container.sass +++ /dev/null @@ -1,23 +0,0 @@ -$container-offset: (2 * $gap) !default - -.container - flex-grow: 1 - margin: 0 auto - position: relative - width: auto - +desktop - max-width: $desktop - $container-offset - &.is-fluid - margin-left: $gap - margin-right: $gap - max-width: none - +until-widescreen - &.is-widescreen - max-width: $widescreen - $container-offset - +until-fullhd - &.is-fullhd - max-width: $fullhd - $container-offset - +widescreen - max-width: $widescreen - $container-offset - +fullhd - max-width: $fullhd - $container-offset diff --git a/themes/lhs/assets/sass/form/_all.sass b/themes/lhs/assets/sass/form/_all.sass deleted file mode 100644 index d9a2b95..0000000 --- a/themes/lhs/assets/sass/form/_all.sass +++ /dev/null @@ -1,8 +0,0 @@ -@charset "utf-8" - -@import "shared.sass" -@import "input-textarea.sass" -@import "checkbox-radio.sass" -@import "select.sass" -@import "file.sass" -@import "tools.sass" diff --git a/themes/lhs/assets/sass/grid/_all.sass b/themes/lhs/assets/sass/grid/_all.sass deleted file mode 100644 index e53070f..0000000 --- a/themes/lhs/assets/sass/grid/_all.sass +++ /dev/null @@ -1,4 +0,0 @@ -@charset "utf-8" - -@import "columns.sass" -@import "tiles.sass" diff --git a/themes/lhs/assets/sass/helpers/_all.sass b/themes/lhs/assets/sass/helpers/_all.sass deleted file mode 100644 index b316ab4..0000000 --- a/themes/lhs/assets/sass/helpers/_all.sass +++ /dev/null @@ -1,12 +0,0 @@ -/* 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" diff --git a/themes/lhs/assets/sass/layout/_all.sass b/themes/lhs/assets/sass/layout/_all.sass deleted file mode 100644 index 143ada3..0000000 --- a/themes/lhs/assets/sass/layout/_all.sass +++ /dev/null @@ -1,5 +0,0 @@ -@charset "utf-8" - -@import "hero.sass" -@import "section.sass" -@import "footer.sass" diff --git a/themes/lhs/assets/sass/leighhack.scss b/themes/lhs/assets/sass/leighhack.scss index 18baddb..100a4d1 100644 --- a/themes/lhs/assets/sass/leighhack.scss +++ b/themes/lhs/assets/sass/leighhack.scss @@ -7,7 +7,7 @@ } // Hackspace Branding -$family-sans-serif: "Roboto", sans-serif; +//$family-sans-serif: "Roboto", sans-serif; $primary: #d41246; $accent: #fbf3ee; $link: $primary; @@ -18,11 +18,11 @@ $navbar-background-color: black; $navbar-burger-color: white; $footer-background-color: black; $footer-link-color: #e2e2e2; -$button-padding-vertical: calc(0.5em) !default; -$body-font-size: 1.375em; -$body-line-height: 1.636em; -$subtitle-font-size:$body-font-size!important; -$subtitle-line-height:$body-line-height; +//$button-padding-vertical: calc(0.5em) !default; +$body-font-size: 1.25em; +//$body-line-height: 1.636em; +//$subtitle-font-size:$body-font-size!important; +//$subtitle-line-height:$body-line-height; // Import Bulmas styles @import "bulma.sass"; diff --git a/themes/lhs/assets/sass/utilities/_all.sass b/themes/lhs/assets/sass/utilities/_all.sass deleted file mode 100644 index bf4ecfe..0000000 --- a/themes/lhs/assets/sass/utilities/_all.sass +++ /dev/null @@ -1,8 +0,0 @@ -@charset "utf-8" - -@import "initial-variables.sass" -@import "functions.sass" -@import "derived-variables.sass" -@import "animations.sass" -@import "mixins.sass" -@import "controls.sass" diff --git a/themes/lhs/assets/sass/utilities/functions.sass b/themes/lhs/assets/sass/utilities/functions.sass deleted file mode 100644 index acd3e83..0000000 --- a/themes/lhs/assets/sass/utilities/functions.sass +++ /dev/null @@ -1,62 +0,0 @@ -@function mergeColorMaps($bulma-colors, $custom-colors) - // we return at least bulma hardcoded colors - $merged-colors: $bulma-colors - - // we want a map as input - @if type-of($custom-colors) == 'map' - @each $name, $components in $custom-colors - // color name should be a string and colors pair a list with at least one element - @if type-of($name) == 'string' and (type-of($components) == 'list' or type-of($components) == 'color') and length($components) >= 1 - $color-base: null - - // the param can either be a single color - // or a list of 2 colors - @if type-of($components) == 'color' - $color-base: $components - @else if type-of($components) == 'list' - $color-base: nth($components, 1) - - $color-invert: null - // is an inverted color provided in the list - @if length($components) > 1 - $color-invert: nth($components, 2) - - // we only want a color as base color - @if type-of($color-base) == 'color' - // if inverted color is not provided or is not a color we compute it - @if type-of($color-invert) != 'color' - $color-invert: findColorInvert($color-base) - - // we merge this colors elements as map with bulma colors (we can override them this way, no multiple definition for the same name) - $merged-colors: map_merge($merged-colors, ($name: ($color-base, $color-invert))) - - @return $merged-colors - -@function powerNumber($number, $exp) - $value: 1 - @if $exp > 0 - @for $i from 1 through $exp - $value: $value * $number - @else if $exp < 0 - @for $i from 1 through -$exp - $value: $value / $number - @return $value - -@function colorLuminance($color) - $color-rgb: ('red': red($color),'green': green($color),'blue': blue($color)) - @each $name, $value in $color-rgb - $adjusted: 0 - $value: $value / 255 - @if $value < 0.03928 - $value: $value / 12.92 - @else - $value: ($value + .055) / 1.055 - $value: powerNumber($value, 2) - $color-rgb: map-merge($color-rgb, ($name: $value)) - @return (map-get($color-rgb, 'red') * .2126) + (map-get($color-rgb, 'green') * .7152) + (map-get($color-rgb, 'blue') * .0722) - -@function findColorInvert($color) - @if (colorLuminance($color) > 0.55) - @return rgba(#000, 0.7) - @else - @return #fff