diff options
Diffstat (limited to 'assets/stylesheets')
| -rw-r--r-- | assets/stylesheets/_bootstrap-grid.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/_bootstrap-reboot.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/_bootstrap.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_carousel.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_close.scss | 15 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_custom-forms.scss | 20 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_functions.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_input-group.scss | 12 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_navbar.scss | 4 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_reboot.scss | 1 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 134 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/mixins/_breakpoints.scss | 2 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/mixins/_hover.scss | 2 |
13 files changed, 122 insertions, 78 deletions
diff --git a/assets/stylesheets/_bootstrap-grid.scss b/assets/stylesheets/_bootstrap-grid.scss index 5fe4d60..5ddfd59 100644 --- a/assets/stylesheets/_bootstrap-grid.scss +++ b/assets/stylesheets/_bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v4.1.1 (https://getbootstrap.com/) + * Bootstrap Grid v4.1.2 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/assets/stylesheets/_bootstrap-reboot.scss b/assets/stylesheets/_bootstrap-reboot.scss index 27c9592..badbf53 100644 --- a/assets/stylesheets/_bootstrap-reboot.scss +++ b/assets/stylesheets/_bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v4.1.1 (https://getbootstrap.com/) + * Bootstrap Reboot v4.1.2 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss index 2866cc5..f8447b9 100644 --- a/assets/stylesheets/_bootstrap.scss +++ b/assets/stylesheets/_bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.1.1 (https://getbootstrap.com/) + * Bootstrap v4.1.2 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss index de51d1b..91c23e5 100644 --- a/assets/stylesheets/bootstrap/_carousel.scss +++ b/assets/stylesheets/bootstrap/_carousel.scss @@ -23,7 +23,6 @@ display: none; align-items: center; width: 100%; - @include transition($carousel-transition); backface-visibility: hidden; perspective: 1000px; } @@ -32,6 +31,7 @@ .carousel-item-next, .carousel-item-prev { display: block; + @include transition($carousel-transition); } .carousel-item-next, diff --git a/assets/stylesheets/bootstrap/_close.scss b/assets/stylesheets/bootstrap/_close.scss index 871cb08..a0dd1e2 100644 --- a/assets/stylesheets/bootstrap/_close.scss +++ b/assets/stylesheets/bootstrap/_close.scss @@ -7,14 +7,15 @@ text-shadow: $close-text-shadow; opacity: .5; - @include hover-focus { - color: $close-color; - text-decoration: none; - opacity: .75; - } - - // Opinionated: add "hand" cursor to non-disabled .close elements &:not(:disabled):not(.disabled) { + + @include hover-focus { + color: $close-color; + text-decoration: none; + opacity: .75; + } + + // Opinionated: add "hand" cursor to non-disabled .close elements cursor: pointer; } } diff --git a/assets/stylesheets/bootstrap/_custom-forms.scss b/assets/stylesheets/bootstrap/_custom-forms.scss index cd75d8b..1311ba4 100644 --- a/assets/stylesheets/bootstrap/_custom-forms.scss +++ b/assets/stylesheets/bootstrap/_custom-forms.scss @@ -177,12 +177,17 @@ } @else { border-radius: 0; } + @include box-shadow($custom-select-box-shadow); appearance: none; &:focus { border-color: $custom-select-focus-border-color; outline: 0; - box-shadow: $custom-select-focus-box-shadow; + @if $enable-shadows { + box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow; + } @else { + box-shadow: $custom-select-focus-box-shadow; + } &::-ms-value { // For visual consistency with other platforms/browsers, @@ -257,6 +262,10 @@ } } + &:disabled ~ .custom-file-label { + background-color: $custom-file-disabled-bg; + } + @each $lang, $value in $custom-file-text { &:lang(#{$lang}) ~ .custom-file-label::after { content: $value; @@ -325,6 +334,7 @@ border: $custom-range-thumb-border; @include border-radius($custom-range-thumb-border-radius); @include box-shadow($custom-range-thumb-box-shadow); + @include transition($custom-forms-transition); appearance: none; &:focus { @@ -355,6 +365,7 @@ border: $custom-range-thumb-border; @include border-radius($custom-range-thumb-border-radius); @include box-shadow($custom-range-thumb-box-shadow); + @include transition($custom-forms-transition); appearance: none; &:focus { @@ -385,6 +396,7 @@ border: $custom-range-thumb-border; @include border-radius($custom-range-thumb-border-radius); @include box-shadow($custom-range-thumb-box-shadow); + @include transition($custom-forms-transition); appearance: none; &:focus { @@ -419,3 +431,9 @@ @include border-radius($custom-range-track-border-radius); } } + +.custom-control-label::before, +.custom-file-label, +.custom-select { + @include transition($custom-forms-transition); +} diff --git a/assets/stylesheets/bootstrap/_functions.scss b/assets/stylesheets/bootstrap/_functions.scss index b44d7d9..bf8be9a 100644 --- a/assets/stylesheets/bootstrap/_functions.scss +++ b/assets/stylesheets/bootstrap/_functions.scss @@ -1,6 +1,6 @@ // Bootstrap functions // -// Utility mixins and functions for evalutating source code across our variables, maps, and mixins. +// Utility mixins and functions for evaluating source code across our variables, maps, and mixins. // Ascending // Used to evaluate Sass maps like our grid breakpoints. diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss index a559f15..a8b0e59 100644 --- a/assets/stylesheets/bootstrap/_input-group.scss +++ b/assets/stylesheets/bootstrap/_input-group.scss @@ -21,11 +21,6 @@ width: 1%; margin-bottom: 0; - // Bring the "active" form control to the top of surrounding elements - &:focus { - z-index: 3; - } - + .form-control, + .custom-select, + .custom-file { @@ -33,6 +28,13 @@ } } + // Bring the "active" form control to the top of surrounding elements + > .form-control:focus, + > .custom-select:focus, + > .custom-file .custom-file-input:focus ~ .custom-file-label { + z-index: 3; + } + > .form-control, > .custom-select { &:not(:last-child) { @include border-right-radius(0); } diff --git a/assets/stylesheets/bootstrap/_navbar.scss b/assets/stylesheets/bootstrap/_navbar.scss index 0502527..52de505 100644 --- a/assets/stylesheets/bootstrap/_navbar.scss +++ b/assets/stylesheets/bootstrap/_navbar.scss @@ -24,7 +24,7 @@ padding: $navbar-padding-y $navbar-padding-x; // Because flex properties aren't inherited, we need to redeclare these first - // few properities so that content nested within behave properly. + // few properties so that content nested within behave properly. > .container, > .container-fluid { display: flex; @@ -94,7 +94,7 @@ // Powered by the collapse Bootstrap JavaScript plugin. // When collapsed, prevent the toggleable navbar contents from appearing in -// the default flexbox row orienation. Requires the use of `flex-wrap: wrap` +// the default flexbox row orientation. Requires the use of `flex-wrap: wrap` // on the `.navbar` parent. .navbar-collapse { flex-basis: 100%; diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss index 7383422..d7bab8d 100644 --- a/assets/stylesheets/bootstrap/_reboot.scss +++ b/assets/stylesheets/bootstrap/_reboot.scss @@ -274,6 +274,7 @@ img { svg:not(:root) { overflow: hidden; // Hide the overflow in IE + vertical-align: middle; } diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 73451a0..6531a93 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -8,7 +8,6 @@ // Color system // -// stylelint-disable $white: #fff !default; $gray-100: #f8f9fa !default; $gray-200: #e9ecef !default; @@ -22,17 +21,22 @@ $gray-900: #212529 !default; $black: #000 !default; $grays: () !default; -$grays: map-merge(( - "100": $gray-100, - "200": $gray-200, - "300": $gray-300, - "400": $gray-400, - "500": $gray-500, - "600": $gray-600, - "700": $gray-700, - "800": $gray-800, - "900": $gray-900 -), $grays); +// stylelint-disable-next-line scss/dollar-variable-default +$grays: map-merge( + ( + "100": $gray-100, + "200": $gray-200, + "300": $gray-300, + "400": $gray-400, + "500": $gray-500, + "600": $gray-600, + "700": $gray-700, + "800": $gray-800, + "900": $gray-900 + ), + $grays +); + $blue: #007bff !default; $indigo: #6610f2 !default; @@ -46,21 +50,25 @@ $teal: #20c997 !default; $cyan: #17a2b8 !default; $colors: () !default; -$colors: map-merge(( - "blue": $blue, - "indigo": $indigo, - "purple": $purple, - "pink": $pink, - "red": $red, - "orange": $orange, - "yellow": $yellow, - "green": $green, - "teal": $teal, - "cyan": $cyan, - "white": $white, - "gray": $gray-600, - "gray-dark": $gray-800 -), $colors); +// stylelint-disable-next-line scss/dollar-variable-default +$colors: map-merge( + ( + "blue": $blue, + "indigo": $indigo, + "purple": $purple, + "pink": $pink, + "red": $red, + "orange": $orange, + "yellow": $yellow, + "green": $green, + "teal": $teal, + "cyan": $cyan, + "white": $white, + "gray": $gray-600, + "gray-dark": $gray-800 + ), + $colors +); $primary: $blue !default; $secondary: $gray-600 !default; @@ -72,17 +80,20 @@ $light: $gray-100 !default; $dark: $gray-800 !default; $theme-colors: () !default; -$theme-colors: map-merge(( - "primary": $primary, - "secondary": $secondary, - "success": $success, - "info": $info, - "warning": $warning, - "danger": $danger, - "light": $light, - "dark": $dark -), $theme-colors); -// stylelint-enable +// stylelint-disable-next-line scss/dollar-variable-default +$theme-colors: map-merge( + ( + "primary": $primary, + "secondary": $secondary, + "success": $success, + "info": $info, + "warning": $warning, + "danger": $danger, + "light": $light, + "dark": $dark + ), + $theme-colors +); // Set a specific jump point for requesting color jumps $theme-color-interval: 8% !default; @@ -114,28 +125,34 @@ $enable-print-styles: true !default; // variables. Mostly focused on spacing. // You can add more entries to the $spacers map, should you need more variation. -// stylelint-disable $spacer: 1rem !default; $spacers: () !default; -$spacers: map-merge(( - 0: 0, - 1: ($spacer * .25), - 2: ($spacer * .5), - 3: $spacer, - 4: ($spacer * 1.5), - 5: ($spacer * 3) -), $spacers); +// stylelint-disable-next-line scss/dollar-variable-default +$spacers: map-merge( + ( + 0: 0, + 1: ($spacer * .25), + 2: ($spacer * .5), + 3: $spacer, + 4: ($spacer * 1.5), + 5: ($spacer * 3) + ), + $spacers +); // This variable affects the `.h-*` and `.w-*` classes. $sizes: () !default; -$sizes: map-merge(( - 25: 25%, - 50: 50%, - 75: 75%, - 100: 100%, - auto: auto -), $sizes); -// stylelint-enable +// stylelint-disable-next-line scss/dollar-variable-default +$sizes: map-merge( + ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100%, + auto: auto + ), + $sizes +); // Body // @@ -451,6 +468,8 @@ $input-group-addon-color: $input-color !default; $input-group-addon-bg: $gray-200 !default; $input-group-addon-border-color: $input-border-color !default; +$custom-forms-transition: background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; + $custom-control-gutter: 1.5rem !default; $custom-control-spacer-x: 1rem !default; @@ -499,9 +518,11 @@ $custom-select-indicator: str-replace(url("data:image/svg+xml;charset= $custom-select-border-width: $input-btn-border-width !default; $custom-select-border-color: $input-border-color !default; $custom-select-border-radius: $border-radius !default; +$custom-select-box-shadow: inset 0 1px 2px rgba($black, .075) !default; $custom-select-focus-border-color: $input-focus-border-color !default; -$custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default; +$custom-select-focus-width: $input-btn-focus-width !default; +$custom-select-focus-box-shadow: 0 0 0 $custom-select-focus-width rgba($custom-select-focus-border-color, .5) !default; $custom-select-font-size-sm: 75% !default; $custom-select-height-sm: $input-height-sm !default; @@ -529,6 +550,7 @@ $custom-file-height: $input-height !default; $custom-file-height-inner: $input-height-inner !default; $custom-file-focus-border-color: $input-focus-border-color !default; $custom-file-focus-box-shadow: $input-btn-focus-box-shadow !default; +$custom-file-disabled-bg: $input-disabled-bg !default; $custom-file-padding-y: $input-btn-padding-y !default; $custom-file-padding-x: $input-btn-padding-x !default; diff --git a/assets/stylesheets/bootstrap/mixins/_breakpoints.scss b/assets/stylesheets/bootstrap/mixins/_breakpoints.scss index d1ad684..59f25a2 100644 --- a/assets/stylesheets/bootstrap/mixins/_breakpoints.scss +++ b/assets/stylesheets/bootstrap/mixins/_breakpoints.scss @@ -42,7 +42,7 @@ @return if($next, breakpoint-min($next, $breakpoints) - .02px, null); } -// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront. +// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front. // Useful for making responsive utilities. // // >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) diff --git a/assets/stylesheets/bootstrap/mixins/_hover.scss b/assets/stylesheets/bootstrap/mixins/_hover.scss index c1224ff..192f847 100644 --- a/assets/stylesheets/bootstrap/mixins/_hover.scss +++ b/assets/stylesheets/bootstrap/mixins/_hover.scss @@ -1,6 +1,6 @@ // Hover mixin and `$enable-hover-media-query` are deprecated. // -// Origally added during our alphas and maintained during betas, this mixin was +// Originally added during our alphas and maintained during betas, this mixin was // designed to prevent `:hover` stickiness on iOS-an issue where hover styles // would persist after initial touch. // |