diff options
| author | Chris Rebert <[email protected]> | 2016-01-13 15:34:01 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-13 15:34:01 -0800 |
| commit | 44a136107937fba8b7906f89c01894655fca5c2e (patch) | |
| tree | 8db985b3d4d3fc79cfc0d97e447a3263f60ac75e | |
| parent | fa696d04659bf1298e06b1926a82513d5a8d691f (diff) | |
| download | bootstrap-44a136107937fba8b7906f89c01894655fca5c2e.tar.xz bootstrap-44a136107937fba8b7906f89c01894655fca5c2e.zip | |
Rename gradient mixins to match new naming convention
gradient-{horizontal=>x}[-three-colors]
gradient-{vertical=>y}[-three-colors]
| -rw-r--r-- | scss/_carousel.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_gradients.scss | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index bf0ea61d3..af8c95c62 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -102,12 +102,12 @@ // Set gradients for backgrounds &.left { - @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001)); + @include gradient-x($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001)); } &.right { right: 0; left: auto; - @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5)); + @include gradient-x($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5)); } // Hover/focus state diff --git a/scss/mixins/_gradients.scss b/scss/mixins/_gradients.scss index c57eddca4..ac96efe2d 100644 --- a/scss/mixins/_gradients.scss +++ b/scss/mixins/_gradients.scss @@ -4,7 +4,7 @@ // // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9. -@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { +@mixin gradient-x($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 @@ -14,7 +14,7 @@ // // Creates two color stops, start and end, by specifying a color and position for each color stop. // Color stops are not available in IE9. -@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { +@mixin gradient-y($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 @@ -24,12 +24,12 @@ background-repeat: repeat-x; background-image: linear-gradient($deg, $start-color, $end-color); } -@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { +@mixin gradient-x-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { 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 gets no color-stop at all for proper fallback } -@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { +@mixin gradient-y-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { 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 gets no color-stop at all for proper fallback |