vendor/assets/stylesheets/bootstrap/_mixins.scss in bootstrap-sass-2.3.1.3 vs vendor/assets/stylesheets/bootstrap/_mixins.scss in bootstrap-sass-2.3.2.0

- old
+ new

@@ -434,10 +434,21 @@ background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+ background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10 background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10 } +@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { + background-color: mix($midColor, $endColor, 80%); + background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); + background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: -o-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); + background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor); + background-repeat: no-repeat; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback +} + @mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { background-color: mix($midColor, $endColor, 80%); background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor); background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor); @@ -576,20 +587,18 @@ @include grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth); @include grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth); } @mixin grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) { - @while $gridColumns > 0 { - .span#{$gridColumns} { @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth)} - $gridColumns: $gridColumns - 1; + @for $i from 1 through $gridColumns { + .span#{$i} { @include grid-core-span($i, $gridColumnWidth, $gridGutterWidth); } } } @mixin grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth) { - @while $gridColumns > 0 { - .offset#{$gridColumns} { @include grid-core-offset($gridColumns, $gridColumnWidth, $gridGutterWidth); } - $gridColumns: $gridColumns - 1; + @for $i from 1 through $gridColumns { + .offset#{$i} { @include grid-core-offset($i, $gridColumnWidth, $gridGutterWidth); } } } @mixin grid-core-span($columns, $gridColumnWidth, $gridGutterWidth) { width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)); @@ -625,21 +634,19 @@ @include grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); } } @mixin grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) { - @while $gridColumns > 0 { - .span#{$gridColumns} { @include grid-fluid-span($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); } - $gridColumns: $gridColumns - 1; + @for $i from 1 through $gridColumns { + .span#{$i} { @include grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth); } } } @mixin grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) { - @while $gridColumns > 0 { - .offset#{$gridColumns} { @include grid-fluid-offset($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); } - .offset#{$gridColumns}:first-child { @include grid-fluid-offset-first-child($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); } - $gridColumns: $gridColumns - 1; + @for $i from 1 through $gridColumns { + .offset#{$i} { @include grid-fluid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth); } + .offset#{$i}:first-child { @include grid-fluid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth); } } } @mixin grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) { width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)); @@ -673,16 +680,15 @@ // generate .spanX @include grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth); } @mixin grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) { - @while $gridColumns > 0 { - input.span#{$gridColumns}, - textarea.span#{$gridColumns}, - .uneditable-input.span#{$gridColumns} { - @include grid-input-span($gridColumns, $gridColumnWidth, $gridGutterWidth); + @for $i from 1 through $gridColumns { + input.span#{$i}, + textarea.span#{$i}, + .uneditable-input.span#{$i} { + @include grid-input-span($i, $gridColumnWidth, $gridGutterWidth); } - $gridColumns: $gridColumns - 1; } } @mixin grid-input-span($columns, $gridColumnWidth, $gridGutterWidth) { width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 14;