rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Jacob Thornton 2012-01-08 00:50:48 -08:00
commit bc505560a0
3 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/progress-bars.less
View file

@ -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);