2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components

Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto
2012-01-27 16:35:32 -08:00
11 changed files with 171 additions and 56 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
#font > .sans-serif(13px, normal, 1);
color: @white;
color: rgba(255,255,255,.75);
background: #444;
background: #6a6a6a;
background: rgba(255,255,255,.3);
border: 1px solid #111;
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);