]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 860a969)
nav and content tweaks
authorMark Otto <markotto@twitter.com>
Thu, 7 Jun 2012 21:01:03 +0000 (14:01 -0700)
committerMark Otto <markotto@twitter.com>
Thu, 7 Jun 2012 21:01:03 +0000 (14:01 -0700)
docs/assets/css/docs.css patch | blob | blame | history
docs/base-css.html patch | blob | blame | history
docs/components.html patch | blob | blame | history
docs/download.html patch | blob | blame | history
docs/examples.html patch | blob | blame | history
docs/index.html patch | blob | blame | history
docs/javascript.html patch | blob | blame | history
docs/less.html patch | blob | blame | history
docs/scaffolding.html patch | blob | blame | history
docs/templates/pages/scaffolding.mustache patch | blob | blame | history
docs/upgrading.html patch | blob | blame | history

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 1e02c299ea2b37a558776aa1f25027ec017b07a0..88d93e4611ae0c21fd7eb6c9749a6cb6495b7fba 100644 (file)
--- 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 7ed6c68ac2da2598ba72a020b5848ecc1d2ed78e..58fbecc39d210056922886f5fbdde4f4c573724b 100644 (file)
--- 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 63cfac9ae6785e822cec01c76b04da20dbfcc8ad..15df4f5ce6954584bf1f98d0e5e49d735d7e52c7 100644 (file)
--- 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 20e86055911fc6836c8bf50d903e900e9e56d0d9..10b35f3eaf8ec9f2ee5f541840f0ad335b3d57f8 100644 (file)
--- 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 374b69ef62d181b85c239a46107e4bd588f0928b..e0e4b5be88cf4056ea965cf7e047b6378cbb9d3e 100644 (file)
--- 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 ccba2ee61befd3a62b7df3d5f01f035b92a6143c..27d74dc3f03d261dad23f2a9027605689942526f 100644 (file)
--- 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 d21ca2d616c541e7d574e7c90a6f307bc62c69d1..abf5df7905bd4510df2bc69c1841d1b03a3738ff 100644 (file)
--- 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 c383660d2094495598d38b18b70d81d2269eba05..a904d31dd79e79c0cbc03a036a6788100ef51e99 100644 (file)
--- 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 9b7b66cd2e5cabd50eab828e71484b28887eb33b..ae69f51dbeb480029f2da7b592ff91efaf3f37a9 100644 (file)
--- 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 ee447da3d3bc5ef31b19ba4f3c31bbe6e33e8898..8eabe21cfad37b0d76c8083053004ab5bcf86ccf 100644 (file)
--- 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 9611ffc41d3563e10067e1cffd25205668435735..f16fe603685c215e98d0ccf2afa52140562615d7 100644 (file)
--- 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>
Mirror of https://github.com/twbs/bootstrap.git