diff options
Diffstat (limited to 'src/sass')
-rw-r--r-- | src/sass/base/bulma.sass | 2 | ||||
-rw-r--r-- | src/sass/base/bulma/base/generic.sass | 3 | ||||
-rw-r--r-- | src/sass/base/bulma/base/helpers.sass | 15 | ||||
-rw-r--r-- | src/sass/base/bulma/base/minireset.sass | 9 | ||||
-rw-r--r-- | src/sass/base/bulma/components/message.sass | 2 | ||||
-rw-r--r-- | src/sass/base/bulma/components/navbar.sass | 6 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/button.sass | 32 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/form.sass | 54 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/image.sass | 3 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/progress.sass | 25 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/table.sass | 7 | ||||
-rw-r--r-- | src/sass/base/bulma/elements/tag.sass | 19 | ||||
-rw-r--r-- | src/sass/base/bulma/layout/footer.sass | 3 | ||||
-rw-r--r-- | src/sass/base/bulma/layout/hero.sass | 2 | ||||
-rw-r--r-- | src/sass/base/bulma/utilities/controls.sass | 3 | ||||
-rw-r--r-- | src/sass/base/bulma/utilities/derived-variables.sass | 1 |
16 files changed, 130 insertions, 56 deletions
diff --git a/src/sass/base/bulma.sass b/src/sass/base/bulma.sass index ac8a2d9..9f10d65 100644 --- a/src/sass/base/bulma.sass +++ b/src/sass/base/bulma.sass @@ -1,5 +1,5 @@ @charset "utf-8" -/*! bulma.io v0.7.2 | MIT License | github.com/jgthms/bulma */ +/*! bulma.io v0.7.4 | MIT License | github.com/jgthms/bulma */ @import "bulma/utilities/_all" @import "bulma/base/_all" @import "bulma/elements/_all" diff --git a/src/sass/base/bulma/base/generic.sass b/src/sass/base/bulma/base/generic.sass index bb0e37a..42a3d88 100644 --- a/src/sass/base/bulma/base/generic.sass +++ b/src/sass/base/bulma/base/generic.sass @@ -103,6 +103,9 @@ strong // Block +fieldset + border: none + pre +overflow-touch background-color: $pre-background diff --git a/src/sass/base/bulma/base/helpers.sass b/src/sass/base/bulma/base/helpers.sass index 10c9056..17fdf15 100644 --- a/src/sass/base/bulma/base/helpers.sass +++ b/src/sass/base/bulma/base/helpers.sass @@ -120,6 +120,21 @@ $alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'rig .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' diff --git a/src/sass/base/bulma/base/minireset.sass b/src/sass/base/bulma/base/minireset.sass index e99311c..9c34a89 100644 --- a/src/sass/base/bulma/base/minireset.sass +++ b/src/sass/base/bulma/base/minireset.sass @@ -1,4 +1,4 @@ -/*! minireset.css v0.0.3 | MIT License | github.com/jgthms/minireset.css */ +/*! minireset.css v0.0.4 | MIT License | github.com/jgthms/minireset.css */ // Blocks html, body, @@ -59,11 +59,16 @@ html // Media img, -audio, +embed, +iframe, +object, video height: auto max-width: 100% +audio + max-width: 100% + // Iframe iframe border: 0 diff --git a/src/sass/base/bulma/components/message.sass b/src/sass/base/bulma/components/message.sass index 272e68b..badac5d 100644 --- a/src/sass/base/bulma/components/message.sass +++ b/src/sass/base/bulma/components/message.sass @@ -25,7 +25,7 @@ $message-header-body-border-width: 0 !default font-size: $size-normal strong color: currentColor - a:not(.button):not(.tag) + a:not(.button):not(.tag):not(.dropdown-item) color: currentColor text-decoration: underline // Sizes diff --git a/src/sass/base/bulma/components/navbar.sass b/src/sass/base/bulma/components/navbar.sass index f11153d..dc90dd9 100644 --- a/src/sass/base/bulma/components/navbar.sass +++ b/src/sass/base/bulma/components/navbar.sass @@ -420,3 +420,9 @@ a.navbar-item, &.is-active .navbar-link background-color: $navbar-item-hover-background-color + +// Combination + +.hero + &.is-fullheight-with-navbar + min-height: calc(100vh - #{$navbar-height}) diff --git a/src/sass/base/bulma/elements/button.sass b/src/sass/base/bulma/elements/button.sass index b23cc33..e75cd2f 100644 --- a/src/sass/base/bulma/elements/button.sass +++ b/src/sass/base/bulma/elements/button.sass @@ -35,6 +35,8 @@ $button-static-border-color: $grey-lighter !default =button-small border-radius: $radius-small font-size: $size-small +=button-normal + font-size: $size-normal =button-medium font-size: $size-medium =button-large @@ -104,7 +106,8 @@ $button-static-border-color: $grey-lighter !default &.is-active background-color: darken($button-text-hover-background-color, 5%) color: $button-text-hover-color - &[disabled] + &[disabled], + fieldset[disabled] & background-color: transparent border-color: transparent box-shadow: none @@ -131,7 +134,8 @@ $button-static-border-color: $grey-lighter !default background-color: darken($color, 5%) border-color: transparent color: $color-invert - &[disabled] + &[disabled], + fieldset[disabled] & background-color: $color border-color: transparent box-shadow: none @@ -140,7 +144,8 @@ $button-static-border-color: $grey-lighter !default color: $color &:hover background-color: darken($color-invert, 5%) - &[disabled] + &[disabled], + fieldset[disabled] & background-color: $color-invert border-color: transparent box-shadow: none @@ -160,7 +165,8 @@ $button-static-border-color: $grey-lighter !default &.is-loading &::after border-color: transparent transparent $color $color !important - &[disabled] + &[disabled], + fieldset[disabled] & background-color: transparent border-color: $color box-shadow: none @@ -173,7 +179,8 @@ $button-static-border-color: $grey-lighter !default &:focus background-color: $color-invert color: $color - &[disabled] + &[disabled], + fieldset[disabled] & background-color: transparent border-color: $color-invert box-shadow: none @@ -181,12 +188,15 @@ $button-static-border-color: $grey-lighter !default // Sizes &.is-small +button-small + &.is-normal + +button-normal &.is-medium +button-medium &.is-large +button-large // Modifiers - &[disabled] + &[disabled], + fieldset[disabled] & background-color: $button-disabled-background-color border-color: $button-disabled-border-color box-shadow: $button-disabled-shadow @@ -225,6 +235,16 @@ $button-static-border-color: $grey-lighter !default margin-bottom: -0.5rem &:not(:last-child) margin-bottom: 1rem + // Sizes + &.are-small + .button:not(.is-normal):not(.is-medium):not(.is-large) + +button-small + &.are-medium + .button:not(.is-small):not(.is-normal):not(.is-large) + +button-medium + &.are-large + .button:not(.is-small):not(.is-normal):not(.is-medium) + +button-large &.has-addons .button &:not(:first-child) diff --git a/src/sass/base/bulma/elements/form.sass b/src/sass/base/bulma/elements/form.sass index 9d717cf..c944b75 100644 --- a/src/sass/base/bulma/elements/form.sass +++ b/src/sass/base/bulma/elements/form.sass @@ -3,6 +3,7 @@ $input-background-color: $white !default $input-border-color: $grey-lighter !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-hover-color: $grey-darker !default $input-hover-border-color: $grey-light !default @@ -15,6 +16,7 @@ $input-focus-box-shadow-color: rgba($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-arrow: $link !default @@ -47,7 +49,7 @@ $help-size: $size-small !default border-color: $input-border-color color: $input-color +placeholder - color: rgba($input-color, 0.3) + color: $input-placeholder-color &:hover, &.is-hovered border-color: $input-hover-border-color @@ -57,13 +59,14 @@ $help-size: $size-small !default &.is-active border-color: $input-focus-border-color box-shadow: $input-focus-box-shadow-size $input-focus-box-shadow-color - &[disabled] + &[disabled], + fieldset[disabled] & background-color: $input-disabled-background-color border-color: $input-disabled-border-color box-shadow: none color: $input-disabled-color +placeholder - color: rgba($input-disabled-color, 0.3) + color: $input-disabled-placeholder-color .input, .textarea @@ -135,7 +138,8 @@ $help-size: $size-small !default cursor: pointer &:hover color: $input-hover-color - &[disabled] + &[disabled], + fieldset[disabled] & color: $input-disabled-color cursor: not-allowed @@ -169,7 +173,8 @@ $help-size: $size-small !default outline: none &::-ms-expand display: none - &[disabled]:hover + &[disabled]:hover, + fieldset[disabled] &:hover border-color: $input-disabled-border-color &:not([multiple]) padding-right: 2.5em @@ -437,13 +442,13 @@ $help-size: $size-small !default .input, .select select border-radius: 0 - &:first-child + &:first-child:not(:only-child) .button, .input, .select select border-bottom-right-radius: 0 border-top-right-radius: 0 - &:last-child + &:last-child:not(:only-child) .button, .input, .select select @@ -498,7 +503,6 @@ $help-size: $size-small !default margin-bottom: -0.75rem &:not(:last-child) margin-bottom: 0 - &.is-horizontal +tablet display: flex @@ -544,44 +548,12 @@ $help-size: $size-small !default margin-right: 0.75rem .control + box-sizing: border-box clear: both //fixes the icon floating out of the input when help text is floated right font-size: $size-normal position: relative text-align: left // Modifiers - // DEPRECATED - &.has-icon - .icon - color: $input-icon-color - height: $input-height - pointer-events: none - position: absolute - top: 0 - width: $input-height - z-index: 4 - .input - &:focus - & + .icon - color: $input-icon-active-color - &.is-small - & + .icon - font-size: $size-small - &.is-medium - & + .icon - font-size: $size-medium - &.is-large - & + .icon - font-size: $size-large - &:not(.has-icon-right) - .icon - left: 0 - .input - padding-left: $input-height - &.has-icon-right - .icon - right: 0 - .input - padding-right: $input-height &.has-icons-left, &.has-icons-right .input, diff --git a/src/sass/base/bulma/elements/image.sass b/src/sass/base/bulma/elements/image.sass index e1e877b..cfa64fe 100644 --- a/src/sass/base/bulma/elements/image.sass +++ b/src/sass/base/bulma/elements/image.sass @@ -26,7 +26,8 @@ $dimensions: 16 24 32 48 64 96 128 !default &.is-9by16, &.is-1by2, &.is-1by3 - img + img, + .has-ratio @extend %overlay height: 100% width: 100% diff --git a/src/sass/base/bulma/elements/progress.sass b/src/sass/base/bulma/elements/progress.sass index 5051406..b263eeb 100644 --- a/src/sass/base/bulma/elements/progress.sass +++ b/src/sass/base/bulma/elements/progress.sass @@ -1,6 +1,8 @@ $progress-bar-background-color: $border !default $progress-value-background-color: $text !default +$progress-indeterminate-duration: 1.5s !default + .progress @extend %block -moz-appearance: none @@ -21,6 +23,20 @@ $progress-value-background-color: $text !default &::-ms-fill background-color: $progress-value-background-color border: none + &:indeterminate + animation-duration: $progress-indeterminate-duration + animation-iteration-count: infinite + animation-name: moveIndeterminate + animation-timing-function: linear + background-color: $progress-bar-background-color + background-image: linear-gradient(to right, $text 30%, $progress-bar-background-color 30%) + background-position: top left + background-repeat: no-repeat + background-size: 150% 150% + &::-webkit-progress-bar + background-color: transparent + &::-moz-progress-bar + background-color: transparent // Colors @each $name, $pair in $colors $color: nth($pair, 1) @@ -31,6 +47,9 @@ $progress-value-background-color: $text !default background-color: $color &::-ms-fill background-color: $color + &:indeterminate + background-image: linear-gradient(to right, $color 30%, $progress-bar-background-color 30%) + // Sizes &.is-small height: $size-small @@ -38,3 +57,9 @@ $progress-value-background-color: $text !default height: $size-medium &.is-large height: $size-large + +@keyframes moveIndeterminate + from + background-position: 200% 0 + to + background-position: -200% 0 diff --git a/src/sass/base/bulma/elements/table.sass b/src/sass/base/bulma/elements/table.sass index a4c7e9b..a1cf936 100644 --- a/src/sass/base/bulma/elements/table.sass +++ b/src/sass/base/bulma/elements/table.sass @@ -11,6 +11,10 @@ $table-head-cell-color: $text-strong !default $table-foot-cell-border-width: 2px 0 0 !default $table-foot-cell-color: $text-strong !default +$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-active-background-color: $primary !default @@ -62,16 +66,19 @@ $table-striped-row-even-hover-background-color: $white-ter !default border-color: $table-row-active-color color: currentColor thead + background-color: $table-head-background-color td, th border-width: $table-head-cell-border-width color: $table-head-cell-color tfoot + background-color: $table-foot-background-color td, th border-width: $table-foot-cell-border-width color: $table-foot-cell-color tbody + background-color: $table-body-background-color tr &:last-child td, diff --git a/src/sass/base/bulma/elements/tag.sass b/src/sass/base/bulma/elements/tag.sass index 7c25054..a5fb3c4 100644 --- a/src/sass/base/bulma/elements/tag.sass +++ b/src/sass/base/bulma/elements/tag.sass @@ -16,6 +16,13 @@ $tag-delete-margin: 1px !default margin-bottom: -0.5rem &:not(:last-child) margin-bottom: 1rem + // Sizes + &.are-medium + .tag:not(.is-normal):not(.is-large) + font-size: $size-normal + &.are-large + .tag:not(.is-normal):not(.is-medium) + font-size: $size-medium &.has-addons .tag margin-right: 0 @@ -37,6 +44,16 @@ $tag-delete-margin: 1px !default margin-left: 0.5rem &:not(:last-child) margin-right: 0 + &.has-addons + .tag + margin-right: 0 + &:not(:first-child) + margin-left: 0 + border-bottom-left-radius: 0 + border-top-left-radius: 0 + &:not(:last-child) + border-bottom-right-radius: 0 + border-top-right-radius: 0 .tag:not(body) align-items: center @@ -62,6 +79,8 @@ $tag-delete-margin: 1px !default background-color: $color color: $color-invert // Sizes + &.is-normal + font-size: $size-small &.is-medium font-size: $size-normal &.is-large diff --git a/src/sass/base/bulma/layout/footer.sass b/src/sass/base/bulma/layout/footer.sass index 6688482..1988153 100644 --- a/src/sass/base/bulma/layout/footer.sass +++ b/src/sass/base/bulma/layout/footer.sass @@ -1,5 +1,6 @@ $footer-background-color: $white-bis !default +$footer-padding: 3rem 1.5rem 6rem !default .footer background-color: $footer-background-color - padding: 3rem 1.5rem 6rem + padding: $footer-padding diff --git a/src/sass/base/bulma/layout/hero.sass b/src/sass/base/bulma/layout/hero.sass index db56b9f..d988040 100644 --- a/src/sass/base/bulma/layout/hero.sass +++ b/src/sass/base/bulma/layout/hero.sass @@ -109,8 +109,6 @@ min-height: 50vh &.is-fullheight min-height: 100vh - &.is-fullheight-with-navbar - min-height: calc(100vh - #{$navbar-height}) // Components diff --git a/src/sass/base/bulma/utilities/controls.sass b/src/sass/base/bulma/utilities/controls.sass index 074072f..7ca0521 100644 --- a/src/sass/base/bulma/utilities/controls.sass +++ b/src/sass/base/bulma/utilities/controls.sass @@ -33,7 +33,8 @@ $control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default &:active, &.is-active outline: none - &[disabled] + &[disabled], + fieldset[disabled] & cursor: not-allowed %control diff --git a/src/sass/base/bulma/utilities/derived-variables.sass b/src/sass/base/bulma/utilities/derived-variables.sass index aa91281..c464814 100644 --- a/src/sass/base/bulma/utilities/derived-variables.sass +++ b/src/sass/base/bulma/utilities/derived-variables.sass @@ -67,6 +67,7 @@ $link-active-border: $grey-dark !default // Typography $family-primary: $family-sans-serif !default +$family-secondary: $family-sans-serif !default $family-code: $family-monospace !default $size-small: $size-7 !default |