From ff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 7 Jun 2012 14:01:03 -0700
Subject: [PATCH] nav and content tweaks
---
docs/assets/css/docs.css | 17 +++++------------
docs/base-css.html | 2 +-
docs/components.html | 2 +-
docs/download.html | 2 +-
docs/examples.html | 2 +-
docs/index.html | 2 +-
docs/javascript.html | 2 +-
docs/less.html | 2 +-
docs/scaffolding.html | 14 ++++++--------
docs/templates/pages/scaffolding.mustache | 12 +++++-------
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 1e02c299ea..88d93e4611 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 7ed6c68ac2..58fbecc39d 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 63cfac9ae6..15df4f5ce6 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 20e8605591..10b35f3eaf 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 374b69ef62..e0e4b5be88 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 ccba2ee61b..27d74dc3f0 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 d21ca2d616..abf5df7905 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 c383660d20..a904d31dd7 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 9b7b66cd2e..ae69f51dbe 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 ee447da3d3..8eabe21cfa 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 9611ffc41d..f16fe60368 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>
--
GitLab