From 5a614fb86d87cff1a2892fe76fb7bdcca231d764 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 19:53:54 -0700 Subject: [PATCH] remove sidenav --- docs/assets/css/docs.css | 87 +++----- docs/base-css.html | 83 ------- docs/components.html | 83 ------- docs/download.html | 83 ------- docs/examples.html | 83 ------- docs/index.html | 83 ------- docs/javascript.html | 83 ------- docs/less.html | 83 ------- docs/scaffolding.html | 250 +++++++--------------- docs/templates/layout.mustache | 83 ------- docs/templates/pages/scaffolding.mustache | 171 +++++++-------- docs/upgrading.html | 83 ------- 12 files changed, 180 insertions(+), 1075 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 45c6693a7e..81fb7dc9be 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -18,57 +18,25 @@ body { background-position: 0 40px; } -body, -li { - line-height: 20px; -} - -.bs-docs-nav { - display: none; - position: fixed; - top: 0; - left: 0; - bottom: 0; - overflow-y: scroll; - width: 140px; - padding: 25px 30px; - background-color: #eee; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.bs-docs-nav ul { - margin-left: 0; - margin-bottom: 10px; -} -.bs-docs-nav ul li { - list-style: none; -} -.bs-docs-nav a { - font-size: 13px; - line-height: 20px; -} -.bs-docs-nav > ul > li > a { - font-size: 14px; - color: #999; -} - -.bs-docs-wrapper { - position: fixed; - top: 0; - left: 200px; - right: 0; - bottom: 0; - padding: 40px 0; - overflow-y: scroll; - -webkit-box-shadow: -10px 0 15px rgba(0,0,0,.05), -5px 0 10px rgba(0,0,0,.05); - -moz-box-shadow: -10px 0 15px rgba(0,0,0,.05), -5px 0 10px rgba(0,0,0,.05); - box-shadow: -10px 0 15px rgba(0,0,0,.05), -5px 0 10px rgba(0,0,0,.05); -} - +/* Custom container for the narrow docs */ .bs-docs-container { max-width: 780px; margin: 0 auto; } +/* Increase docs base type size and line-heights */ +body { + line-height: 20px; +} +p { + margin-bottom: 15px; +} +li { + line-height: 25px; +} + + + /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ .navbar { @@ -97,6 +65,12 @@ section { padding-top: 60px; } +/* Table of contents */ +.bs-docs-contents li { + line-height: 25px; + color: #777; +} + /* Faded out hr */ hr.soften { height: 1px; @@ -108,17 +82,6 @@ hr.soften { border: 0; } -/* Table of contents */ -.bs-docs-contents { -} -.bs-docs-contents h3 { - -} -.bs-docs-contents li { - line-height: 25px; - color: #777; -} - /* Jumbotrons -------------------------------------------------- */ @@ -365,8 +328,8 @@ hr.soften { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - min-height: 30px; - line-height: 30px; + min-height: 40px; + line-height: 40px; } .show-grid:hover [class*="span"] { background: #ddd; @@ -667,6 +630,9 @@ form.well { font-size: 13px; line-height: 18px; } +.bs-docs-example p { + margin-bottom: 9px; +} .bs-docs-example p:last-child { margin-bottom: 0; } @@ -674,6 +640,9 @@ form.well { font-size: 18px; line-height: 24px; } +.bs-docs-example li { + line-height: 18px; +} /* Responsive table ------------------------- */ diff --git a/docs/base-css.html b/docs/base-css.html index 16eca66c76..aed1a5e08b 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -74,89 +74,6 @@ -
- - -
-
-
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
  • - Scaffolding - -
    • -
  • - Base CSS - -
    • -
  • - Components - -
    • -
  • - Javascript - -
    • -
  • - LESS - -
    • -
  • - Customize -
    • -
  • - Examples -
    • - -
    -
    -
    + 
     <div class="row">
-  <div class="span6">
+  <div class="span8">
     Level 1 column
     <div class="row">
-      <div class="span3">Level 2</div>
-      <div class="span3">Level 2</div>
+      <div class="span4">Level 2</div>
+      <div class="span4">Level 2</div>
     </div>
   </div>
 </div>
    -
    - @@ -335,7 +245,8 @@

    Fluid grid system 12 responsive, percent-based columns

    -

    Fluid columns

    +

    Live fluid grid example

    +

    The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.

    1
    @@ -369,13 +280,8 @@
    -

    Percents, not pixels

    -

    The fluid grid system uses percents for column widths instead of fixed pixels. It also has the same responsive variations as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.

    - -

    Fluid rows

    -

    Make any row fluid simply by changing .row to .row-fluid. The columns stay the exact same, making it super straightforward to flip between fixed and fluid layouts.

    - -

    Markup

    +

    Basic fluid grid HTML

    +

    Make any row "fluid" by changing .row to .row-fluid. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.

     <div class="row-fluid">
   <div class="span4">...</div>
@@ -384,7 +290,7 @@

    Fluid nesting

    -

    Nesting with fluid grids is a bit different: the number of nested columns doesn't need to match the parent. Instead, your columns are reset at each level because each row takes up 100% of the parent column.

    +

    Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.

    Fluid 12 @@ -398,7 +304,6 @@
    - 
     <div class="row-fluid">
   <div class="span12">
@@ -421,6 +326,9 @@
   
    
     
    Grid customization
    
   
    
+
+  
    Variables in LESS
    
+  
    The default grid is built on a few variables for easy customization via LESS. All variables can be found in variables.less.
    
   
@@ -445,17 +353,24 @@
         
+      
+        
+        
+        
+      
+      
+        
+        
+        
+      
    
     
       
    20px
         Negative space between columns
       
    @fluidGridColumnWidth6.382978723%Width of each fluid column
    @fluidGridGutterWidth2.127659574%Negative space between fluid columns
    
     
   
    
 
-  
    Variables in LESS
    
-  
    Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.
    
-
   
    How to customize
    
-  
    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.
    
+  
    Modifying the grid means changing the three @grid* variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the four ways documented to recompile. If you're adding more columns, be sure to add the CSS for those in grid.less.
    
 
-  
    Staying responsive
    
-  
    Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.
    
+  
    Staying responsive
    
+  
    Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to manually customize the grids in responsive.less until a future update improves this.
    
 
 
 
@@ -469,7 +384,7 @@
   
 
   
    Fixed layout
    
-  
    The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.
    
+  
    Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.
    
   
    
     
    
   
    
@@ -482,7 +397,7 @@

    Fluid layout

    -

    <div class="container-fluid"> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.

    +

    Create a fluid, two-column page with <div class="container-fluid">—great for applications and docs.

    @@ -511,9 +426,16 @@

    Responsive design Media queries for various devices and resolutions

    - -

    Responsive devices

    -

    What they do

    +

    Enabling responsive features

    +

    Turn on responsive CSS in your project by including the proper meta tag and additional stylesheet within the <head> of your document. If you've compiled Bootstrap from the Customize page, you need only include the meta tag.

    +
    +<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
+
    +

    Heads up! Bootstrap doesn't include responsive features by default at this time as not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it as needed.

    + +

    About responsive Bootstrap

    + Responsive devices

    Media queries allow for custom CSS based on a number of conditions—ratios, widths, display type, etc—but usually focuses around min-width and max-width.