]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Prevent grids from collapsing, fix affixed side nav for docs
authorMark Otto <otto@github.com>
Wed, 16 Jan 2013 21:11:45 +0000 (13:11 -0800)
committerMark Otto <otto@github.com>
Wed, 16 Jan 2013 21:11:45 +0000 (13:11 -0800)
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/grid.less

index 65cde5fda0b3c4b3b44b67058a83385be1e94f80..afb9b68a4d2f38d1156b959471e55c678d93e3e8 100644 (file)
@@ -719,6 +719,7 @@ pre code {
 }
 
 [class^="span"] {
+  min-height: 1px;
   padding-right: 10px;
   padding-left: 10px;
   -webkit-box-sizing: border-box;
index f37b18e3e0a894ee7a3a437f621b766164e427ce..f973c6395cb328e25a2f066343154964073de54d 100644 (file)
@@ -157,6 +157,39 @@ section > ul li {
 
 
 
+/* Sidenav
+-------------------------------------------------- */
+
+.bs-docs-sidenav {
+  width: 218px;
+  margin: 20px 0 0;
+}
+/* Chevrons */
+.bs-docs-sidenav .glyphicon-chevron-right {
+  float: right;
+  margin-top: 1px;
+  margin-right: -6px;
+  opacity: .25;
+  color: #000;
+}
+.bs-docs-sidenav a:hover .glyphicon-chevron-right {
+  opacity: .5;
+}
+.bs-docs-sidenav .active .glyphicon-chevron-right,
+.bs-docs-sidenav .active a:hover .glyphicon-chevron-right {
+  color: #fff;
+  opacity: 1;
+}
+.bs-docs-sidenav.affix {
+  top: 10px;
+}
+.bs-docs-sidenav.affix-bottom {
+  position: absolute;
+  top: auto;
+  bottom: 270px;
+}
+
+
 
 /* Bootstrap code examples
 -------------------------------------------------- */
index 2638ee068339dbc6cd3e2d97f233f44c165a7fe7..751e9d8c60a81a5d5bfdf3f16964d28957d0ca7c 100644 (file)
@@ -16,6 +16,7 @@
   .clear_float();
 }
 [class^="span"] {
+  min-height: 1px;
   padding-left: 10px;
   padding-right: 10px;
   // Proper box-model (padding doesn't add to width)