github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs

Browse Source
This commit is contained in:
Mark Otto
2012-08-19 21:12:52 -07:00
parent e4d4ef43b0
commit 4e979f084d
18 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -110,6 +110,7 @@
margin-left: 30px;
}
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 1170px;
@@ -455,6 +456,7 @@
margin-left: 20px;
}
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 724px;

8
docs/assets/css/bootstrap.css vendored
View File

@@ -219,6 +219,7 @@ a:hover {
}
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 940px;
@@ -4172,7 +4173,8 @@ input[type="submit"].btn.btn-mini {
}
.navbar-fixed-top .navbar-inner,
.navbar-fixed-bottom .navbar-inner {
.navbar-fixed-bottom .navbar-inner,
.navbar-static-top .navbar-inner {
border: 0;
}
@@ -4185,6 +4187,7 @@ input[type="submit"].btn.btn-mini {
border-radius: 0;
}
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 940px;
@@ -4194,7 +4197,8 @@ input[type="submit"].btn.btn-mini {
top: 0;
}
.navbar-fixed-top .navbar-inner {
.navbar-fixed-top .navbar-inner,
.navbar-static-top .navbar-inner {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);

33
docs/assets/css/docs.css
View File

@@ -12,7 +12,6 @@
body {
position: relative;
padding-top: 40px;
}
/* Code in headings */
@@ -26,12 +25,12 @@ h3 code {
/* Tweak navbar brand link to be super sleek
-------------------------------------------------- */
body > .navbar-fixed-top {
body > .navbar-static-top {
font-size: 13px;
}
/* Change the docs' brand */
body > .navbar-fixed-top .brand {
body > .navbar-static-top .brand {
padding-right: 0;
padding-left: 0;
margin-left: 20px;
@@ -43,7 +42,7 @@ body > .navbar-fixed-top .brand {
-moz-transition: all .2s linear;
transition: all .2s linear;
}
body > .navbar-fixed-top .brand:hover {
body > .navbar-static-top .brand:hover {
text-decoration: none;
text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.4);
}
@@ -54,7 +53,7 @@ body > .navbar-fixed-top .brand:hover {
/* padding for in-page bookmarks and fixed navbar */
section {
padding-top: 60px;
padding-top: 30px;
}
section > .page-header,
section > .lead {
@@ -759,10 +758,9 @@ form.bs-docs-example {
}
.bs-docs-sidenav {
width: 218px;
width: 228px;
margin-top: 30px;
padding: 0;
margin-right: 10px;
background-color: #fff;
margin-left: 0;
-webkit-border-radius: 6px;
@@ -790,9 +788,13 @@ form.bs-docs-example {
border-radius: 0 0 6px 6px;
}
.bs-docs-sidenav > .active > a {
border-color: #08c;
position: relative;
z-index: 2;
padding: 9px 15px;
border: 0;
-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
}
/* Chevrons */
.bs-docs-sidenav .icon-chevron-right {
@@ -807,12 +809,13 @@ form.bs-docs-example {
.bs-docs-sidenav a:hover .icon-chevron-right {
opacity: .5;
}
.bs-docs-sidenav .active .icon-chevron-right {
.bs-docs-sidenav .active .icon-chevron-right,
.bs-docs-sidenav .active a:hover .icon-chevron-right {
background-image: url(../img/glyphicons-halflings-white.png);
opacity: .75;
}
.bs-docs-sidenav.affix {
top: 40px;
top: 0;
}
.bs-docs-sidenav.affix-bottom {
position: absolute;
@@ -869,18 +872,11 @@ form.bs-docs-example {
body {
padding-top: 0;
}
/* Widen masthead and social buttons to fill body padding */
.jumbotron {
margin-top: -20px; /* Offset bottom margin on .navbar */
}
/* Adjust sidenav width */
.bs-docs-sidenav {
width: 166px;
margin-top: 20px;
}
.bs-docs-sidenav.affix {
top: 0;
}
}
/* Tablet
@@ -936,9 +932,6 @@ form.bs-docs-example {
.footer p {
margin-bottom: 9px;
}
.bs-docs-sidenav.affix {
top: 0;
}
}
/* Landscape phones