diff options
Diffstat (limited to 'xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins')
15 files changed, 45 insertions, 60 deletions
diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss index 3faf0b5..b1e6df9 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_alerts.scss @@ -1,13 +1,14 @@ // Alerts @mixin alert-variant($background, $border, $text-color) { + color: $text-color; background-color: $background; border-color: $border; - color: $text-color; hr { border-top-color: darken($border, 5%); } + .alert-link { color: darken($text-color, 10%); } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss index ce19499..e03c390 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_border-radius.scss @@ -1,18 +1,18 @@ // Single side border-radius @mixin border-top-radius($radius) { + border-top-left-radius: $radius; border-top-right-radius: $radius; - border-top-left-radius: $radius; } @mixin border-right-radius($radius) { + border-top-right-radius: $radius; border-bottom-right-radius: $radius; - border-top-right-radius: $radius; } @mixin border-bottom-radius($radius) { border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + border-bottom-left-radius: $radius; } @mixin border-left-radius($radius) { + border-top-left-radius: $radius; border-bottom-left-radius: $radius; - border-top-left-radius: $radius; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss index b93f84b..5afa735 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_buttons.scss @@ -12,33 +12,29 @@ &.focus { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 25%); + border-color: darken($border, 25%); } &:hover { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 12%); + border-color: darken($border, 12%); } &:active, &.active, .open > &.dropdown-toggle { color: $color; background-color: darken($background, 10%); - border-color: darken($border, 12%); + background-image: none; + border-color: darken($border, 12%); &:hover, &:focus, &.focus { color: $color; background-color: darken($background, 17%); - border-color: darken($border, 25%); + border-color: darken($border, 25%); } } - &:active, - &.active, - .open > &.dropdown-toggle { - background-image: none; - } &.disabled, &[disabled], fieldset[disabled] & { @@ -46,7 +42,7 @@ &:focus, &.focus { background-color: $background; - border-color: $border; + border-color: $border; } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss index e06fb5e..ed69097 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_center-block.scss @@ -2,6 +2,6 @@ @mixin center-block() { display: block; - margin-left: auto; margin-right: auto; + margin-left: auto; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss index dc3e2ab..e45eca5 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_clearfix.scss @@ -13,8 +13,8 @@ @mixin clearfix() { &:before, &:after { - content: " "; // 1 display: table; // 2 + content: " "; // 1 } &:after { clear: both; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss index 277aa5f..46578a1 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_forms.scss @@ -20,18 +20,18 @@ // Set the border and box shadow on specific inputs to match .form-control { border-color: $border-color; - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); // Redeclare so transitions work &:focus { border-color: darken($border-color, 10%); - $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%); + $shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten($border-color, 20%); @include box-shadow($shadow); } } // Set validation states also for addons .input-group-addon { color: $text-color; - border-color: $border-color; background-color: $background-color; + border-color: $border-color; } // Optional feedback icon .form-control-feedback { @@ -57,7 +57,7 @@ &:focus { border-color: $color; outline: 0; - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba); + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba); } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss index a8939f5..fd81440 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_gradients.scss @@ -1,5 +1,3 @@ -// Gradients - // Horizontal gradient, from left to right @@ -10,8 +8,8 @@ background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12 background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down + background-repeat: repeat-x; } // Vertical gradient, from top to bottom @@ -22,36 +20,36 @@ background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Opera 12 background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down + background-repeat: repeat-x; } @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) { - background-repeat: repeat-x; background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+ background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12 background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + background-repeat: repeat-x; } @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback + background-repeat: no-repeat; } @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); - background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback + background-repeat: no-repeat; } @mixin gradient-radial($inner-color: #555, $outer-color: #333) { background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color); background-image: radial-gradient(circle, $inner-color, $outer-color); background-repeat: no-repeat; } -@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) { +@mixin gradient-striped($color: rgba(255, 255, 255, .15), $angle: 45deg) { background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss index 16d038c..2b84cb1 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid-framework.scss @@ -13,8 +13,8 @@ // Prevent columns from collapsing when empty min-height: 1px; // Inner gutter via padding - padding-left: ceil(($grid-gutter-width / 2)); padding-right: floor(($grid-gutter-width / 2)); + padding-left: ceil(($grid-gutter-width / 2)); } } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss index 59551da..884ac4f 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_grid.scss @@ -4,17 +4,17 @@ // Centered container element @mixin container-fixed($gutter: $grid-gutter-width) { + padding-right: ceil(($gutter / 2)); + padding-left: floor(($gutter / 2)); margin-right: auto; margin-left: auto; - padding-left: floor(($gutter / 2)); - padding-right: ceil(($gutter / 2)); @include clearfix; } // Creates a wrapper for a series of columns @mixin make-row($gutter: $grid-gutter-width) { - margin-left: ceil(($gutter / -2)); margin-right: floor(($gutter / -2)); + margin-left: ceil(($gutter / -2)); @include clearfix; } @@ -24,8 +24,8 @@ float: left; width: percentage(($columns / $grid-columns)); min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); } @mixin make-xs-column-offset($columns) { margin-left: percentage(($columns / $grid-columns)); @@ -41,8 +41,8 @@ @mixin make-sm-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-sm-min) { float: left; @@ -69,8 +69,8 @@ @mixin make-md-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-md-min) { float: left; @@ -97,8 +97,8 @@ @mixin make-lg-column($columns, $gutter: $grid-gutter-width) { position: relative; min-height: 1px; - padding-left: ($gutter / 2); padding-right: ($gutter / 2); + padding-left: ($gutter / 2); @media (min-width: $screen-lg-min) { float: left; diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss index c8dcf5e..b5a109b 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_image.scss @@ -1,8 +1,3 @@ -// Image Mixins -// - Responsive image -// - Retina image - - // Responsive image // // Keep images from scaling beyond the width of their parents. @@ -22,11 +17,11 @@ @media only screen and (-webkit-min-device-pixel-ratio: 2), - only screen and ( min--moz-device-pixel-ratio: 2), - only screen and ( -o-min-device-pixel-ratio: 2/1), - only screen and ( min-device-pixel-ratio: 2), - only screen and ( min-resolution: 192dpi), - only screen and ( min-resolution: 2dppx) { + only screen and ( min--moz-device-pixel-ratio: 2), + only screen and ( -o-min-device-pixel-ratio: 2/1), + only screen and ( min-device-pixel-ratio: 2), + only screen and ( min-resolution: 192dpi), + only screen and ( min-resolution: 2dppx) { background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}")); background-size: $width-1x $height-1x; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss index 88e9a57..e9c5573 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_opacity.scss @@ -1,8 +1,7 @@ // Opacity @mixin opacity($opacity) { - opacity: $opacity; - // IE8 filter - $opacity-ie: ($opacity * 100); + $opacity-ie: ($opacity * 100); // IE8 filter filter: alpha(opacity=$opacity-ie); + opacity: $opacity; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss index c9c2841..8997eca 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_reset-text.scss @@ -2,17 +2,17 @@ font-family: $font-family-base; // We deliberately do NOT reset font-size. font-style: normal; - font-weight: normal; - letter-spacing: normal; - line-break: auto; + font-weight: 400; line-height: $line-height-base; + line-break: auto; text-align: left; // Fallback for where `start` is not supported text-align: start; text-decoration: none; text-shadow: none; text-transform: none; - white-space: normal; + letter-spacing: normal; word-break: normal; word-spacing: normal; word-wrap: normal; + white-space: normal; } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss index 83fa637..66f233a 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_resize.scss @@ -1,6 +1,6 @@ // Resize anything @mixin resizable($direction) { - resize: $direction; // Options: horizontal, vertical, both overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible` + resize: $direction; // Options: horizontal, vertical, both } diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss index cbdf777..d25ef97 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_responsive-visibility.scss @@ -1,7 +1,3 @@ -// Responsive utilities - -// -// More easily include all the states for responsive-utilities.less. // [converter] $parent hack @mixin responsive-visibility($parent) { #{$parent} { diff --git a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss index b3d0371..93d5775 100644 --- a/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss +++ b/xstatic/pkg/bootstrap_scss/data/scss/bootstrap/mixins/_vendor-prefixes.scss @@ -89,12 +89,12 @@ // Optional hyphenation @mixin hyphens($mode: auto) { - word-wrap: break-word; -webkit-hyphens: $mode; -moz-hyphens: $mode; -ms-hyphens: $mode; // IE10+ -o-hyphens: $mode; hyphens: $mode; + word-wrap: break-word; } // Placeholder text |