mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests
This commit is contained in:
parent
55982664d0
commit
7d412b1e14
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -442,7 +442,7 @@
|
|||||||
background-color: mix(@midColor, @endColor, 80%);
|
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-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: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
||||||
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop*100%, @endColor);
|
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
|
||||||
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
||||||
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
|
@ -65,3 +65,75 @@ body {
|
|||||||
.fluid-grid .span1 {
|
.fluid-grid .span1 {
|
||||||
background-color: #999;
|
background-color: #999;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Gradients */
|
||||||
|
|
||||||
|
[class^="gradient-"] {
|
||||||
|
width: 100%;
|
||||||
|
height: 400px;
|
||||||
|
margin: 20px 0;
|
||||||
|
-webkit-border-radius: 5px;
|
||||||
|
-moz-border-radius: 5px;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-horizontal {
|
||||||
|
background-color: #333333;
|
||||||
|
background-image: -moz-linear-gradient(left, #555555, #333333);
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 100% 0, from(#555555), to(#333333));
|
||||||
|
background-image: -webkit-linear-gradient(left, #555555, #333333);
|
||||||
|
background-image: -o-linear-gradient(left, #555555, #333333);
|
||||||
|
background-image: linear-gradient(to right, #555555, #333333);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff333333', GradientType=1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-vertical {
|
||||||
|
background-color: #474747;
|
||||||
|
background-image: -moz-linear-gradient(top, #555555, #333333);
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
|
||||||
|
background-image: -webkit-linear-gradient(top, #555555, #333333);
|
||||||
|
background-image: -o-linear-gradient(top, #555555, #333333);
|
||||||
|
background-image: linear-gradient(to bottom, #555555, #333333);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff333333', GradientType=0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-directional {
|
||||||
|
background-color: #333333;
|
||||||
|
background-image: -moz-linear-gradient(45deg, #555555, #333333);
|
||||||
|
background-image: -webkit-linear-gradient(45deg, #555555, #333333);
|
||||||
|
background-image: -o-linear-gradient(45deg, #555555, #333333);
|
||||||
|
background-image: linear-gradient(45deg, #555555, #333333);
|
||||||
|
background-repeat: repeat-x;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-vertical-three {
|
||||||
|
background-color: #8940a5;
|
||||||
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#00b3ee), color-stop(50%, #7a43b6), to(#c3325f));
|
||||||
|
background-image: -webkit-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
|
||||||
|
background-image: -moz-linear-gradient(top, #00b3ee, #7a43b6 50%, #c3325f);
|
||||||
|
background-image: -o-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
|
||||||
|
background-image: linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff00b3ee', endColorstr='#ffc3325f', GradientType=0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-radial {
|
||||||
|
background-color: #333333;
|
||||||
|
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#555555), to(#333333));
|
||||||
|
background-image: -webkit-radial-gradient(circle, #555555, #333333);
|
||||||
|
background-image: -moz-radial-gradient(circle, #555555, #333333);
|
||||||
|
background-image: -o-radial-gradient(circle, #555555, #333333);
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gradient-striped {
|
||||||
|
background-color: #555555;
|
||||||
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
||||||
|
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
||||||
|
background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
||||||
|
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
||||||
|
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
||||||
|
}
|
@ -1179,6 +1179,36 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Gradients
|
||||||
|
================================================== -->
|
||||||
|
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>Gradients</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h4>Horizontal</h4>
|
||||||
|
<div class="gradient-horizontal"></div>
|
||||||
|
|
||||||
|
<h4>Vertical</h4>
|
||||||
|
<div class="gradient-vertical"></div>
|
||||||
|
|
||||||
|
<h4>Directional</h4>
|
||||||
|
<div class="gradient-directional"></div>
|
||||||
|
|
||||||
|
<h4>Three colors</h4>
|
||||||
|
<div class="gradient-vertical-three"></div>
|
||||||
|
|
||||||
|
<h4>Radial</h4>
|
||||||
|
<div class="gradient-radial"></div>
|
||||||
|
|
||||||
|
<h4>Striped</h4>
|
||||||
|
<div class="gradient-striped"></div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div><!-- /container -->
|
</div><!-- /container -->
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user