aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-26 11:08:27 -0700
committerMark Otto <[email protected]>2013-07-26 11:08:27 -0700
commit9e98b733f165e32170bebb705b665770dcf966d2 (patch)
tree13e64311a71feb2587c042c3b87e9aeb8abfc268 /less
parente62e992b88cc1223c8485e9415bba9213764257a (diff)
downloadbootstrap-9e98b733f165e32170bebb705b665770dcf966d2.tar.xz
bootstrap-9e98b733f165e32170bebb705b665770dcf966d2.zip
Vars update
* Drop progress bar text-shadow * Reorganize popover and tooltip vars and fix complier error due to missing `;` * Run `grunt`
Diffstat (limited to 'less')
-rw-r--r--less/progress-bars.less1
-rw-r--r--less/variables.less33
2 files changed, 18 insertions, 16 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 6e059e934..fe399abf7 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -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);
diff --git a/less/variables.less b/less/variables.less
index 1be593701..878725f6c 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -310,28 +310,31 @@
@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;
-@popover-bg: #fff;
-@popover-arrow-width: 10px;
-@popover-arrow-color: #fff;
-@popover-title-bg: darken(@popover-bg, 3%);
+// Popovers
+// -------------------------
+@popover-bg: #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-outer-width: (@popover-arrow-width + 1);
-@popover-arrow-outer-color: rgba(0,0,0,.25);
-@popover-arrow-outer-fallback-color: #999;
+@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-arrow-outer-width: (@popover-arrow-width + 1);
+@popover-arrow-outer-color: rgba(0,0,0,.25);
+@popover-arrow-outer-fallback-color: #999;
// 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