diff options
| author | Mark Otto <[email protected]> | 2012-06-07 14:01:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-07 14:01:03 -0700 |
| commit | ff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05 (patch) | |
| tree | 230ddc497684cc577f59d555bb4583000e348591 | |
| parent | 860a96939a58831228c2ea90055ca82cd9c84698 (diff) | |
| download | bootstrap-ff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05.tar.xz bootstrap-ff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05.zip | |
nav and content tweaks
| -rw-r--r-- | docs/assets/css/docs.css | 17 | ||||
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/download.html | 2 | ||||
| -rw-r--r-- | docs/examples.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/less.html | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 14 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 12 | ||||
| -rw-r--r-- | docs/upgrading.html | 2 |
11 files changed, 24 insertions, 35 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 1e02c299e..88d93e461 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -158,6 +158,7 @@ hr.soften { line-height: 1; } .jumbotron p { + max-width: 780px; margin-bottom: 20px; font-weight: 300; } @@ -772,13 +773,6 @@ form.bs-docs-example { border: 1px solid #d6e9c6; } -/* Grid examples -------------------------- */ -.bs-docs-grid { - width: 940px; - margin-left: -80px; -} - /* Responsive Docs @@ -988,14 +982,13 @@ form.bs-docs-example { /* LARGE DESKTOP SCREENS */ @media (min-width: 1210px) { + .bs-docs-container { + max-width: 970px; + } + /* Update subnav container */ .subnav-fixed .nav { width: 1168px; /* 2px less to account for left/right borders being removed when in fixed mode */ } - .bs-docs-grid { - width: 1170px; - margin-left: -195px; - } - } diff --git a/docs/base-css.html b/docs/base-css.html index 7ed6c68ac..58fbecc39 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/components.html b/docs/components.html index 63cfac9ae..15df4f5ce 100644 --- a/docs/components.html +++ b/docs/components.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/download.html b/docs/download.html index 20e860559..10b35f3ea 100644 --- a/docs/download.html +++ b/docs/download.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/examples.html b/docs/examples.html index 374b69ef6..e0e4b5be8 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/index.html b/docs/index.html index ccba2ee61..27d74dc3f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/javascript.html b/docs/javascript.html index d21ca2d61..abf5df790 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/less.html b/docs/less.html index c383660d2..a904d31dd 100644 --- a/docs/less.html +++ b/docs/less.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 9b7b66cd2..ae69f51db 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> @@ -173,24 +173,22 @@ <div class="span1">1</div> <div class="span1">1</div> <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> </div> <div class="row show-grid"> - <div class="span4">4</div> + <div class="span2">2</div> <div class="span4">4</div> <div class="span4">4</div> </div> <div class="row show-grid"> <div class="span4">4</div> - <div class="span8">8</div> + <div class="span4">6</div> </div> <div class="row show-grid"> - <div class="span6">6</div> - <div class="span6">6</div> + <div class="span5">5</div> + <div class="span5">5</div> </div> <div class="row show-grid"> - <div class="span12">12</div> + <div class="span10">10</div> </div> </div> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index ee447da3d..8eabe21cf 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -62,24 +62,22 @@ <div class="span1">1</div> <div class="span1">1</div> <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> </div> <div class="row show-grid"> - <div class="span4">4</div> + <div class="span2">2</div> <div class="span4">4</div> <div class="span4">4</div> </div> <div class="row show-grid"> <div class="span4">4</div> - <div class="span8">8</div> + <div class="span4">6</div> </div> <div class="row show-grid"> - <div class="span6">6</div> - <div class="span6">6</div> + <div class="span5">5</div> + <div class="span5">5</div> </div> <div class="row show-grid"> - <div class="span12">12</div> + <div class="span10">10</div> </div> </div> diff --git a/docs/upgrading.html b/docs/upgrading.html index 9611ffc41..f16fe6036 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -27,7 +27,7 @@ </head> - <body> + <body > <div class="bs-docs-nav"> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> |