1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Vars update

* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
This commit is contained in:
Mark Otto 2013-07-26 11:08:27 -07:00
parent e62e992b88
commit 9e98b733f1
4 changed files with 25 additions and 24 deletions

View file

@ -3598,7 +3598,7 @@ button.close {
text-align: left;
white-space: normal;
background-color: #ffffff;
border: 1px solid #ccc;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@ -3662,7 +3662,7 @@ button.close {
bottom: -11px;
left: 50%;
margin-left: -11px;
border-top-color: #999;
border-top-color: #999999;
border-top-color: rgba(0, 0, 0, 0.25);
border-bottom-width: 0;
}
@ -3679,7 +3679,7 @@ button.close {
top: 50%;
left: -11px;
margin-top: -11px;
border-right-color: #999;
border-right-color: #999999;
border-right-color: rgba(0, 0, 0, 0.25);
border-left-width: 0;
}
@ -3696,7 +3696,7 @@ button.close {
top: -11px;
left: 50%;
margin-left: -11px;
border-bottom-color: #999;
border-bottom-color: #999999;
border-bottom-color: rgba(0, 0, 0, 0.25);
border-top-width: 0;
}
@ -3713,7 +3713,7 @@ button.close {
top: 50%;
right: -11px;
margin-top: -11px;
border-left-color: #999;
border-left-color: #999999;
border-left-color: rgba(0, 0, 0, 0.25);
border-right-width: 0;
}
@ -4044,9 +4044,8 @@ a.list-group-item.active > .badge,
width: 0;
height: 100%;
font-size: 12px;
color: #fff;
color: #ffffff;
text-align: center;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #428bca;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);

File diff suppressed because one or more lines are too long

View file

@ -59,7 +59,6 @@
font-size: @font-size-small;
color: @progress-bar-color;
text-align: center;
text-shadow: @progress-bar-text-shadow;
background-color: @progress-bar-bg;
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
.transition(width .6s ease);

View file

@ -310,29 +310,32 @@
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
// Tooltips and popovers
// Tooltips
// -------------------------
@tooltip-max-width: 200px;
@tooltip-color: #fff;
@tooltip-bg: rgba(0,0,0,.9);
@tooltip-arrow-width: 5px;
@tooltip-arrow-color: @tooltip-bg;
@tooltip-max-width: 200px;
// Popovers
// -------------------------
@popover-bg: #fff;
@popover-arrow-width: 10px;
@popover-arrow-color: #fff;
@popover-max-width: 276px;
@popover-border-color: rgba(0,0,0,.2);
@popover-fallback-border-color: #ccc;
@popover-title-bg: darken(@popover-bg, 3%);
// Special enhancement for popovers
@popover-arrow-width: 10px;
@popover-arrow-color: #fff;
@popover-arrow-outer-width: (@popover-arrow-width + 1);
@popover-arrow-outer-color: rgba(0,0,0,.25);
@popover-arrow-outer-fallback-color: #999;
@popover-max-width: 276px;
@popover-border-color: rgba(0,0,0,.2)
@popover-fallback-border-color: #ccc;
// Labels
// -------------------------
@ -384,13 +387,13 @@
// Progress bars
// -------------------------
@progress-bg: #f5f5f5;
@progress-bar-color: #fff;
@progress-bar-bg: @brand-primary;
@progress-bar-success-bg: @brand-success;
@progress-bar-warning-bg: @brand-warning;
@progress-bar-danger-bg: @brand-danger;
@progress-bar-info-bg: @brand-info;
@progress-bar-color: #fff;
@progress-bar-text-shadow: 0 -1px 0 rgba(0,0,0,.25);
// List group