mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-17 14:54:30 +01:00
Move inline properties to variables.less
moved buttons.less, carousel.less & close.less in this commit
This commit is contained in:
parent
453346262f
commit
c2e37414d8
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
&:hover,
|
&:hover,
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #fff;
|
color: @btn-hover-color;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,9 +72,9 @@
|
|||||||
width: 15%;
|
width: 15%;
|
||||||
.opacity(.5);
|
.opacity(.5);
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
color: #fff;
|
color: @carousel-control-color;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
text-shadow: 0 1px 2px rgba(0,0,0,.6);
|
text-shadow: @carousel-control-text-shadow;
|
||||||
// We can't have this transition here because webkit cancels the carousel
|
// We can't have this transition here because webkit cancels the carousel
|
||||||
// animation if you trip this while in the middle of another animation.
|
// animation if you trip this while in the middle of another animation.
|
||||||
|
|
||||||
@ -93,7 +93,7 @@
|
|||||||
// Hover/focus state
|
// Hover/focus state
|
||||||
&:hover,
|
&:hover,
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #fff;
|
color: @carousel-control-hover-color;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
.opacity(.9);
|
.opacity(.9);
|
||||||
}
|
}
|
||||||
@ -144,7 +144,7 @@
|
|||||||
height: 10px;
|
height: 10px;
|
||||||
margin: 1px;
|
margin: 1px;
|
||||||
text-indent: -999px;
|
text-indent: -999px;
|
||||||
border: 1px solid #fff;
|
border: 1px solid @carousel-indicators-li-border-color;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
@ -152,7 +152,7 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
width: 12px;
|
width: 12px;
|
||||||
height: 12px;
|
height: 12px;
|
||||||
background-color: #fff;
|
background-color: @carousel-indicators-active-bg;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,9 +167,9 @@
|
|||||||
z-index: 10;
|
z-index: 10;
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
color: #fff;
|
color: @carousel-caption-color;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
text-shadow: 0 1px 2px rgba(0,0,0,.6);
|
text-shadow: @carousel-caption-text-shadow;
|
||||||
& .btn {
|
& .btn {
|
||||||
text-shadow: none; // No shadow for button elements in carousel-caption
|
text-shadow: none; // No shadow for button elements in carousel-caption
|
||||||
}
|
}
|
||||||
|
@ -8,13 +8,13 @@
|
|||||||
font-size: (@font-size-base * 1.5);
|
font-size: (@font-size-base * 1.5);
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
color: #000;
|
color: @close-color;
|
||||||
text-shadow: 0 1px 0 rgba(255,255,255,1);
|
text-shadow: @close-text-shadow;
|
||||||
.opacity(.2);
|
.opacity(.2);
|
||||||
|
|
||||||
&:hover,
|
&:hover,
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #000;
|
color: @close-hover-color;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
.opacity(.5);
|
.opacity(.5);
|
||||||
|
@ -117,6 +117,8 @@
|
|||||||
@btn-info-bg: @brand-info;
|
@btn-info-bg: @brand-info;
|
||||||
@btn-info-border: @btn-info-bg;
|
@btn-info-border: @btn-info-bg;
|
||||||
|
|
||||||
|
@btn-hover-color: #fff;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Forms
|
// Forms
|
||||||
@ -390,6 +392,23 @@
|
|||||||
@breadcrumb-color: #ccc;
|
@breadcrumb-color: #ccc;
|
||||||
@breadcrumb-active-color: @gray-light;
|
@breadcrumb-active-color: @gray-light;
|
||||||
|
|
||||||
|
// Carousel
|
||||||
|
// ------------------------
|
||||||
|
@carousel-control-color: #fff;
|
||||||
|
@carousel-control-hover-color: #fff;
|
||||||
|
@carousel-control-text-shadow: 0 1px 2px rgba(0,0,0,.6);
|
||||||
|
|
||||||
|
@carousel-indicators-active-bg: #fff;
|
||||||
|
@carousel-indicators-li-border-color: #fff;
|
||||||
|
|
||||||
|
@carousel-caption-color: #fff;
|
||||||
|
@carousel-caption-text-shadow: 0 1px 2px rgba(0,0,0,.6);
|
||||||
|
|
||||||
|
// Close
|
||||||
|
// ------------------------
|
||||||
|
@close-color: #000;
|
||||||
|
@close-hover-color: #000;
|
||||||
|
@close-text-shadow: 0 1px 0 rgba(255,255,255,1);
|
||||||
|
|
||||||
// Miscellaneous
|
// Miscellaneous
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user