mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
This commit is contained in:
Jacob Thornton
2012-01-23 15:06:56 -08:00
parent f764aee4b9 a074087034
commit 74521e8354
17 changed files with 381 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+45 -2
View File
@@ -115,8 +115,8 @@ section {
------------------------- */
/* supporting docs pages */
.subhead {
padding-bottom: 14px;
border-bottom: 3px solid #e5e5e5;
padding-bottom: 0;
border-bottom: 0;
}
.subhead h1,
.subhead p {
@@ -126,6 +126,36 @@ section {
font-size: 45px;
}
/* Subnav */
.subhead .nav {
padding: 0 10px;
background-color: #eeeeee; /* Old browsers */
background-repeat: repeat-x; /* Repeat the gradient */
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
border: 1px solid #eee;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.subhead .nav a {
margin: 0;
padding-top: 11px;
padding-bottom: 11px;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.subhead .nav .active a {
background-color: #fff;
color: #333;
}
/* Quick links
-------------------------------------------------- */
@@ -418,6 +448,7 @@ h2 + .row {
margin: -18px 0 27px;
font-size: 18px;
font-weight: 300;
line-height: 24px;
color: #999;
text-align: center;
}
@@ -533,6 +564,18 @@ form.well {
margin: 0 auto 10px;
}
/* Subnav */
.subhead .nav {
padding: 0;
background: none;
}
.subhead .nav > li {
float: none;
}
.subhead .nav li + li a {
border-top: 1px solid #eee;
}
/* Don't space out quick links so much */
.quick-links {
margin: 40px 0 0;