mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Code Activity

Merge branch 'master' of github.com:twitter/bootstrap into js-examples

Browse Source 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
This commit is contained in:
Jacob Thornton
2011-09-02 21:04:25 -07:00
parent b4a84e1e7d 2589c0ac4e
commit 0e13f8dca1
15 changed files with 1050 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+2 -4
View File
@@ -24,8 +24,7 @@ section > .row {
background-image: -moz-linear-gradient(#004D9F, #049cd9);
background-image: -o-linear-gradient(top, #004D9F, #049cd9);
background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0))";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */
}
#masthead div.inner, #footer div.inner {
background: transparent url(../img/grid-18px.png) top center;
@@ -200,8 +199,7 @@ div.topbar-wrapper div.topbar {
position: absolute;
margin: 0 -20px;
}
div.topbar-wrapper div.topbar .fill {
div.topbar-wrapper div.topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;