aboutsummaryrefslogtreecommitdiff
path: root/lib/progress-bars.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-08 00:50:48 -0800
committerJacob Thornton <[email protected]>2012-01-08 00:50:48 -0800
commitbc505560a05cd867ea8dbfbcefe2217223d58316 (patch)
tree2a2948c3b8b606cf5707ab7a37199d18b114c435 /lib/progress-bars.less
parent4478df768168fe41599508688046612bf5f1e526 (diff)
parent3c2f82f469be4792e85eb73fd1e3b882dcadd48d (diff)
downloadbootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.tar.xz
bootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css bootstrap.min.css
Diffstat (limited to 'lib/progress-bars.less')
-rw-r--r--lib/progress-bars.less6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/progress-bars.less b/lib/progress-bars.less
index 28c56d131..f5a839834 100644
--- a/lib/progress-bars.less
+++ b/lib/progress-bars.less
@@ -39,16 +39,14 @@
height: 18px;
margin-bottom: 18px;
#gradient > .vertical(#f5f5f5, #f9f9f9);
- border: 1px solid #ddd;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
}
// Bar of progress
.progress .bar {
width: 0%;
- height: 20px;
- margin: -1px;
- #gradient > .vertical(#62c462, #57a957);
+ height: 18px;
+ margin: ;
#gradient > .vertical(#149bdf, #0480be);
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
.box-sizing(border-box);