From beb2c13f4d9648da38cefa019f1ee7039b8a7f28 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 16 Jan 2013 13:11:45 -0800 Subject: [PATCH] Prevent grids from collapsing, fix affixed side nav for docs --- docs/assets/css/bootstrap.css | 1 + docs/assets/css/docs.css | 33 +++++++++++++++++++++++++++++++++ less/grid.less | 1 + 3 files changed, 35 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 65cde5fda0..afb9b68a4d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -719,6 +719,7 @@ pre code { } [class^="span"] { + min-height: 1px; padding-right: 10px; padding-left: 10px; -webkit-box-sizing: border-box; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f37b18e3e0..f973c6395c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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 -------------------------------------------------- */ diff --git a/less/grid.less b/less/grid.less index 2638ee0683..751e9d8c60 100644 --- a/less/grid.less +++ b/less/grid.less @@ -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)