From c44bd1edf43c43ed8782f956813cb6142cbe068c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 21:08:31 -0700 Subject: revamp docs to have new width, start realigning the base css page to match --- docs/scaffolding.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 4d6835caf..8ff977b73 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,7 +74,7 @@ -
+
-- cgit v1.2.3 From f0ff20ec40435bfffc36b11e0cdf32eae5adc6be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 23:10:30 -0700 Subject: updating scaffolding page to single column --- docs/scaffolding.html | 578 ++++++++++++++++++++++++-------------------------- 1 file changed, 272 insertions(+), 306 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 8ff977b73..78cb0ba1b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -102,33 +102,29 @@

Global styles for CSS reset, typography, and links

-
-
-

Requires HTML5 doctype

-

Bootstrap makes use of HTML elements and CSS properties that require the use of the HTML5 doctype. Be sure to include it at the beginning of every Bootstrapped page in your project.

+ +

Requires HTML5 doctype

+

Bootstrap makes use of HTML elements and CSS properties that require the use of the HTML5 doctype. Be sure to include it at the beginning of every Bootstrapped page in your project.

 <!DOCTYPE html>
 <html lang="en">
   ...
 </html>
-
-
-

Typography and links

-

Within the scaffolding.less file, we set basic global display, typography, and link styles. Specifically, we:

-
    -
  • Remove margin on the body
    • -
  • Set background-color: white; on the body
    • -
  • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • -
  • Set the global link color via @linkColor and apply link underlines only on :hover
    • -
-
-
-

Reset via Normalize

-

As of Bootstrap 2, the traditional CSS reset has evolved to make use of elements from Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate.

-

The new reset can still be found in reset.less, but with many elements removed for brevity and accuracy.

-
-
+ +

Typography and links

+

Within the scaffolding.less file, we set basic global display, typography, and link styles. Specifically, we:

+
    +
  • Remove margin on the body
    • +
  • Set background-color: white; on the body
    • +
  • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • +
  • Set the global link color via @linkColor and apply link underlines only on :hover
    • +
+ +

Reset via Normalize

+

As of Bootstrap 2, the traditional CSS reset has evolved to make use of elements from Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate.

+

The new reset can still be found in reset.less, but with many elements removed for brevity and accuracy.

+ @@ -141,36 +137,39 @@

Default grid system 12 columns with a responsive twist

-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
-
-
-
4
-
8
-
-
-
6
-
6
-
-
-
12
+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
4
+
4
+
4
+
+
+
4
+
8
+
+
+
6
+
6
+
+
+
12
+
+

The default grid system provided in Bootstrap utilizes 12 columns that render out at widths of 724px, 940px (default without responsive CSS included), and 1170px. Below 767px viewports, the columns become fluid and stack vertically.

@@ -191,17 +190,19 @@

Offsetting columns

-
-
4
-
4 offset 4
-
-
-
3 offset 3
-
3 offset 3
-
-
-
8 offset 4
-
+
+
+
4
+
4 offset 4
+
+
+
3 offset 3
+
3 offset 3
+
+
+
8 offset 4
+
+ 
 <div class="row">
   <div class="span4">...</div>
@@ -257,76 +258,69 @@

Fluid columns

-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
-
-
-
4
-
8
-
-
-
6
-
6
-
-
-
12
+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
4
+
4
+
4
+
+
+
4
+
8
+
+
+
6
+
6
+
+
+
12
+
-
-
-

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

+

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

 <div class="row-fluid">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
-
-

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 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.

+
+
+ Fluid 12
-
- Fluid 12 -
-
- Fluid 6 -
-
- Fluid 6 -
-
+
+ Fluid 6 +
+
+ Fluid 6
-
-
+
+
+ 
 <div class="row-fluid">
   <div class="span12">
@@ -338,8 +332,6 @@
   </div>
 </div>
-
-
@@ -377,20 +369,15 @@ -
-
-

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.

-
-
-

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.

-
-
+ +

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.

+ +

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.

@@ -403,13 +390,11 @@

Layouts Basic templates to create webpages

-
-
-

Fixed layout

-

The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.

-
-
-
+

Fixed layout

+

The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div class="container">.

+
+
+ 
 <body>
   <div class="container">
@@ -417,14 +402,13 @@
   </div>
 </body>
-
-
-

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.

-
-
-
-
+ +

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.

+
+
+
+ 
 <div class="container-fluid">
   <div class="row-fluid">
@@ -437,8 +421,6 @@
   </div>
 </div>
-
-
@@ -450,84 +432,78 @@

Responsive design Media queries for various devices and resolutions

+ -
-
-

Responsive devices

-

What they do

-

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.

-
    -
  • Modify the width of column in our grid
    • -
  • Stack elements instead of float wherever necessary
    • -
  • Resize headings and text to be more appropriate for devices
    • -
-

Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

-
-
-

Supported devices

-

Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LabelLayout widthColumn widthGutter width
Smartphones480px and belowFluid columns, no fixed widths
Smartphones to tablets767px and belowFluid columns, no fixed widths
Portrait tablets768px and above42px20px
Default980px and up60px20px
Large display1200px and up70px30px
- -

Requires meta tag

-

To ensure devices display responsive pages properly, include the viewport meta tag.

- 
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-
+

Responsive devices

+

What they do

+

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.

+
    +
  • Modify the width of column in our grid
    • +
  • Stack elements instead of float wherever necessary
    • +
  • Resize headings and text to be more appropriate for devices
    • +
+

Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

+ +

Supported devices

+

Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LabelLayout widthColumn widthGutter width
Smartphones480px and belowFluid columns, no fixed widths
Smartphones to tablets767px and belowFluid columns, no fixed widths
Portrait tablets768px and above42px20px
Default980px and up60px20px
Large display1200px and up70px30px
+ +

Requires meta tag

+

To ensure devices display responsive pages properly, include the viewport meta tag.

+ 
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+

Using the media queries

-
-
-

Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

-
    -
  1. Use the compiled responsive version, bootstrap-responsive.css
    2. -
  2. Add @import "responsive.less" and recompile Bootstrap
    3. -
  3. Modify and recompile responsive.less as a separate file
    4. -
-

Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

-
-
+

Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:

+
    +
  1. Use the compiled responsive version, bootstrap-responsive.css
    2. +
  2. Add @import "responsive.less" and recompile Bootstrap
    3. +
  3. Modify and recompile responsive.less as a separate file
    4. +
+

Why not just include it? Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.

+ 
   /* Landscape phones and down */
   @media (max-width: 480px) { ... }
@@ -541,95 +517,85 @@
   /* Large desktop */
   @media (min-width: 1200px) { ... }
-
-
+

Responsive utility classes

-
-
-

What are they

-

For faster mobile-friendly development, use these basic utility classes for showing and hiding content by device.

-

When to use

-

Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

-

For example, you might show a <select> element for nav on mobile layouts, but not on tablets or desktops.

-
-
-

Support classes

-

Shown here is a table of the classes we support and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ClassPhones 480px and belowTablets 767px and belowDesktops 768px and above
.visible-phoneVisible
.visible-tabletVisible
.visible-desktopVisible
.hidden-phoneVisibleVisible
.hidden-tabletVisibleVisible
.hidden-desktopVisibleVisible
-

Test case

-

Resize your browser or load on different devices to test the above classes.

-

Visible on...

-

Green checkmarks indicate that class is visible in your current viewport.

-
    -
  • Phone✔ Phone
    • -
  • Tablet✔ Tablet
    • -
  • Desktop✔ Desktop
    • -
-

Hidden on...

-

Here, green checkmarks indicate that class is hidden in your current viewport.

-
    -
  • Phone✔ Phone
    • -
  • Tablet✔ Tablet
    • -
  • Desktop✔ Desktop
    • -
-
-
+

What are they

+

For faster mobile-friendly development, use these basic utility classes for showing and hiding content by device.

+

When to use

+

Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

+

For example, you might show a <select> element for nav on mobile layouts, but not on tablets or desktops.

+ +

Support classes

+

Shown here is a table of the classes we support and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ClassPhones 480px and belowTablets 767px and belowDesktops 768px and above
.visible-phoneVisible
.visible-tabletVisible
.visible-desktopVisible
.hidden-phoneVisibleVisible
.hidden-tabletVisibleVisible
.hidden-desktopVisibleVisible
+

Test case

+

Resize your browser or load on different devices to test the above classes.

+

Visible on...

+

Green checkmarks indicate that class is visible in your current viewport.

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
+

Hidden on...

+

Here, green checkmarks indicate that class is hidden in your current viewport.

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
-
-
-
-
-- cgit v1.2.3 From 446f9199c60f3781c653cf39847ef881a4e197d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 23:31:26 -0700 Subject: updated index page and footer --- docs/scaffolding.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 78cb0ba1b..5bd5dcef7 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -602,10 +602,10 @@
-- cgit v1.2.3 From de53f62a0464f92fe0c175478dc38696eebbda99 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 4 Jun 2012 23:57:48 -0700 Subject: more changes to js and components, playing with new docs subnav --- docs/scaffolding.html | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5bd5dcef7..cd80fc80a 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -81,7 +81,20 @@

Scaffolding

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-
+ +
+

Contents

+ +
+ +
-- cgit v1.2.3 From dd127611e12b9bab9d6da0c24532c5cd151108fd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 00:46:16 -0700 Subject: two col scaffolding rev --- docs/scaffolding.html | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index cd80fc80a..ffc55c3b9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,7 +74,23 @@
-
+
+ +
+
+
+

Contents

+
    +
  1. Global styles
    2. +
  2. Grid system
    3. +
  3. Fluid grid system
    4. +
  4. Customizing
    5. +
  5. Layouts
    6. +
  6. Responsive design
    7. +
+
+
+
@@ -82,17 +98,6 @@

Scaffolding

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

-
-

Contents

- -
-
+

The default grid system provided in Bootstrap utilizes 12 columns that render out at widths of 724px, 940px (default without responsive CSS included), and 1170px. Below 767px viewports, the columns become fluid and stack vertically. 

 <div class="row">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
-
-
-

As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.

-
-
+ +

As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.


@@ -611,14 +609,16 @@ +
+
-- cgit v1.2.3 From 22918f8f92d29a12a42db4e357f3d439e41bad0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 17:16:17 -0700 Subject: more tweaks to layouts and some docs styles --- docs/scaffolding.html | 67 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 21 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index ffc55c3b9..5a91d67a6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,23 +74,7 @@
-
- -
-
-
-

Contents

-
    -
  1. Global styles
    2. -
  2. Grid system
    3. -
  3. Fluid grid system
    4. -
  4. Customizing
    5. -
  5. Layouts
    6. -
  6. Responsive design
    7. -
-
-
-
+
@@ -98,7 +82,6 @@

Scaffolding

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

- +
+

Contents

+
    +
  1. + Global styles + +
    2. +
  2. + Grid system + +
    3. +
  3. + Fluid grid system + +
    4. +
  4. + Grid Customization +
    5. +
  5. + Layouts + +
    6. +
  6. + Responsive design + +
    7. +
+
+
-- cgit v1.2.3 From 8ee067952202cc8a6e4865eab46598e346ad3971 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 18:25:46 -0700 Subject: updated javascripts for first pass at single column --- docs/scaffolding.html | 134 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 47 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 5a91d67a6..9884c42e3 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,68 +74,108 @@
-
- - -
-

Scaffolding

-

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

- -
- - -
-

Contents

-
    -
  1. - Global styles +
    + + +
    + +
    + + +
    +

    Scaffolding

    +

    Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

    +
    + + +
    +

    Contents

    +
      +
    1. Global styles
      2. +
    2. Grid system
      3. +
    3. Fluid grid system
      4. +
    4. Customizing
      5. +
    5. Layouts
      6. +
    6. Responsive design
    -- cgit v1.2.3 From 5a614fb86d87cff1a2892fe76fb7bdcca231d764 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Jun 2012 19:53:54 -0700 Subject: remove sidenav --- docs/scaffolding.html | 250 +++++++++++++++----------------------------------- 1 file changed, 74 insertions(+), 176 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 9884c42e3..c93509ce4 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,89 +74,6 @@
-
- - -
-
-
+ 
 <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.

- - - + + -- cgit v1.2.3 From a12f0e551f7da763a9be23013d1b51c161a0f6f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jul 2012 18:11:49 -0700 Subject: overhaul docs on sub pages, clean up css and copy --- docs/scaffolding.html | 708 +++++++++++++++++++++++--------------------------- 1 file changed, 327 insertions(+), 381 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 0a94cf49a..ca94d8a54 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -66,43 +66,44 @@ -
-
-

Scaffolding

-

Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.

+
+

Scaffolding

+

Bootstrap is built on a responsive 12-column grid and includes fixed- and fluid-width layouts.

+
+
- -
-
- -
-
+ +
+
+ +
+
- -
-
-

Global styles for CSS reset, typography, and links

-
-

Requires HTML5 doctype

-

Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.

+ +
+
+

Global styles for CSS reset, typography, and links

+
+ +

Requires HTML5 doctype

+

Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.

 <!DOCTYPE html>
 <html lang="en">
@@ -110,84 +111,84 @@
 </html>
-

Typography and links

-

Bootstrap sets basic global display, typography, and link styles. Specifically, we:

-
    -
  • Remove margin on the body
    • -
  • Set background-color: white; on the body
    • -
  • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • -
  • Set the global link color via @linkColor and apply link underlines only on :hover
    • -
-

These styles can be found within scaffolding.less.

- -

Reset via Normalize

-

With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

+

Typography and links

+

Bootstrap sets basic global display, typography, and link styles. Specifically, we:

+
    +
  • Remove margin on the body
    • +
  • Set background-color: white; on the body
    • +
  • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
    • +
  • Set the global link color via @linkColor and apply link underlines only on :hover
    • +
+

These styles can be found within scaffolding.less.

-
+

Reset via Normalize

+

With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.

+
- -
-
-

Default grid system 12 columns with a responsive twist

-
-

Live grid example

-

The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.

-
-
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
2
-
3
-
4
-
-
-
4
-
5
+ +
+
+

Default grid system 12 columns with a responsive twist

-
-
9
+ +

Live grid example

+

The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.

+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
2
+
3
+
4
+
+
+
4
+
5
+
+
+
9
+
-
-

Basic grid HTML

-

For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row.

+

Basic grid HTML

+

For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row.

 <div class="row">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
-

Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.

- -

Offsetting columns

-

Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.

-
-
-
4
-
3 offset 2
-
-
-
3 offset 1
-
3 offset 2
-
-
-
6 offset 3
-
-
+

Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.

+ +

Offsetting columns

+

Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.

+
+
+
4
+
3 offset 2
+
+
+
3 offset 1
+
3 offset 2
+
+
+
6 offset 3
+
+ 
 <div class="row">
   <div class="span4">...</div>
@@ -195,23 +196,23 @@
 </div>
-

Nesting columns

-

To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.

-

Example

-

Here two nested .span4 columns are placed within a .span8.

-
-
- Level 1 of column -
-
- Level 2 -
-
- Level 2 +

Nesting columns

+

To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.

+

Example

+

Here two nested .span4 columns are placed within a .span8.

+
+
+ Level 1 of column +
+
+ Level 2 +
+
+ Level 2 +
- 
 <div class="row">
   <div class="span10">
@@ -223,54 +224,54 @@
   </div>
 </div>
-
+
- -
-
-

Fluid grid system 12 responsive, percent-based 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
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
-
-
4
-
4
-
4
+ +
+
+

Fluid grid system 12 responsive, percent-based columns

-
-
4
-
8
-
-
-
6
-
6
-
-
-
12
+ +

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
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
4
+
4
+
4
+
+
+
4
+
8
+
+
+
6
+
6
+
+
+
12
+
-
-

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.

+

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>
@@ -278,21 +279,21 @@
 </div>
-

Fluid offsetting

-

Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

-
-
-
4
-
4 offset 4
-
-
-
3 offset 3
-
3 offset 3
-
-
-
6 offset 6
-
-
+

Fluid offsetting

+

Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

+
+
+
4
+
4 offset 4
+
+
+
3 offset 3
+
3 offset 3
+
+
+
6 offset 6
+
+ 
 <div class="row-fluid">
   <div class="span4">...</div>
@@ -300,21 +301,21 @@
 </div>
-

Fluid nesting

-

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 -
-
- Fluid 6 -
-
- Fluid 6 +

Fluid nesting

+

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 +
+
+ Fluid 6 +
+
+ Fluid 6 +
- 
 <div class="row-fluid">
   <div class="span12">
@@ -327,78 +328,23 @@
 </div>
-
+
- -
-
-

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.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariableDefault valueDescription
@gridColumns12Number of columns
@gridColumnWidth60pxWidth of each column
@gridGutterWidth20pxNegative space between columns
@fluidGridColumnWidth6.382978723%Width of each fluid column
@fluidGridGutterWidth2.127659574%Negative space between fluid columns
- -

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.

- -

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.

- -
- - - - -
-
-

Layouts Basic templates to create webpages

-
+ +
+
+

Layouts Basic templates to create webpages

+
-

Fixed layout

-

Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

-
-
-
+

Fixed layout

+

Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

+
+
+ 
 <body>
   <div class="container">
@@ -407,12 +353,12 @@
 </body>
-

Fluid layout

-

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

-
-
-
-
+

Fluid layout

+

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

+
+
+
+ 
 <div class="container-fluid">
   <div class="row-fluid">
@@ -425,78 +371,78 @@
   </div>
 </div>
-
+
- -
-
-

Responsive design Media queries for various devices and resolutions

-
+ +
+
+

Responsive design Media queries for various devices and resolutions

+
-

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.

+

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.

-
    -
  • Modify the width of column in our grid
    • -
  • Stack elements instead of float wherever necessary
    • -
  • Resize headings and text to be more appropriate for devices
    • -
-

Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

- -

Supported devices

-

Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LabelLayout widthColumn widthGutter width
Phones480px and belowFluid columns, no fixed widths
Phones to tablets767px and belowFluid columns, no fixed widths
Portrait tablets768px and above42px20px
Default980px and up60px20px
Large display1200px and up70px30px
+

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.

+
    +
  • Modify the width of column in our grid
    • +
  • Stack elements instead of float wherever necessary
    • +
  • Resize headings and text to be more appropriate for devices
    • +
+

Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

+ +

Supported devices

+

Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LabelLayout widthColumn widthGutter width
Phones480px and belowFluid columns, no fixed widths
Phones to tablets767px and belowFluid columns, no fixed widths
Portrait tablets768px and above42px20px
Default980px and up60px20px
Large display1200px and up70px30px
 /* Landscape phones and down */
 @media (max-width: 480px) { ... }
@@ -512,85 +458,85 @@
-

Responsive utility classes

-

For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
.visible-phoneVisible
.visible-tabletVisible
.visible-desktopVisible
.hidden-phoneVisibleVisible
.hidden-tabletVisibleVisible
.hidden-desktopVisibleVisible
- -

When to use

-

Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

- -

Responsive utilities test case

-

Resize your browser or load on different devices to test the above classes.

-

Visible on...

-

Green checkmarks indicate that class is visible in your current viewport.

-
    -
  • Phone✔ Phone
    • -
  • Tablet✔ Tablet
    • -
  • Desktop✔ Desktop
    • -
-

Hidden on...

-

Here, green checkmarks indicate that class is hidden in your current viewport.

-
    -
  • Phone✔ Phone
    • -
  • Tablet✔ Tablet
    • -
  • Desktop✔ Desktop
    • -
+

Responsive utility classes

+

For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
.visible-phoneVisible
.visible-tabletVisible
.visible-desktopVisible
.hidden-phoneVisibleVisible
.hidden-tabletVisibleVisible
.hidden-desktopVisibleVisible
+ +

When to use

+

Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

+ +

Responsive utilities test case

+

Resize your browser or load on different devices to test the above classes.

+

Visible on...

+

Green checkmarks indicate that class is visible in your current viewport.

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
+

Hidden on...

+

Here, green checkmarks indicate that class is hidden in your current viewport.

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
-
+
+
-
-
+
-- cgit v1.2.3 From 9343e1e933c1a38ec4cc58024b01edda631863b0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jul 2012 21:38:18 -0700 Subject: remove getting started link from home, add to navbar, overhaul getting started docs --- docs/scaffolding.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index ca94d8a54..dcdbadda4 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -45,6 +45,9 @@
  • Home
    • +
  • + Get started +
  • Scaffolding
    • -- cgit v1.2.3 From e20d2dfe9d1f43e164d8fdbef64f4041df70b762 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jul 2012 16:13:25 -0700 Subject: docs cleanup and blockquote cleanup for .pull-right option --- docs/scaffolding.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dcdbadda4..1aca819f9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -168,7 +168,7 @@

    Basic grid HTML

    -

    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row.

    +

    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).

     <div class="row">
   <div class="span4">...</div>
@@ -207,10 +207,10 @@
             
    
               Level 1 of column
               
    
-                
    
+                
    
                   Level 2
                 
    
-                
    
+                
    
                   Level 2
                 
    
               
    
@@ -218,11 +218,11 @@
           
    
 
     <div class="row">
-  <div class="span10">
+  <div class="span9">
     Level 1 column
     <div class="row">
-      <div class="span5">Level 2</div>
-      <div class="span5">Level 2</div>
+      <div class="span6">Level 2</div>
+      <div class="span3">Level 2</div>
     </div>
   </div>
 </div>
-- 
cgit v1.2.3


From b9105b98f9ee5f15d5b18bccf277344683d4a6db Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 20 Jul 2012 22:06:47 -0700
Subject: move from downloads.html to customize.html to better match purpose of
 page, fix up customize page layout to match other docs, link style refinement
 to jumbotrons

---
 docs/scaffolding.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 1aca819f9..e43b4db30 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -61,7 +61,7 @@
                 Javascript
               
               
  • 
-                Extend
+                Customize
               
    • 
             
           
    
-- 
cgit v1.2.3


From dcf75697ecd243517b23d8ef440f772d91f699c0 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Sun, 22 Jul 2012 18:28:39 -0700
Subject: some progress on affix plugin

---
 docs/scaffolding.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index e43b4db30..2ee264678 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -86,7 +86,7 @@
   ================================================== -->
   
    
     
    
-      
      
+      
        
         
      • Global styles 
        • 
         
      • Grid system 
        • 
         
      • Fluid grid system 
        • 
@@ -579,6 +579,7 @@
     
     
     
+    
     
 
 
-- 
cgit v1.2.3


From 0dda2c4659c6e0407b5b9fda6618ab5c8c12a897 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 23 Jul 2012 22:36:08 -0700
Subject: make docs scroll over jumbotrons, but only for 980px up

---
 docs/scaffolding.html | 620 +++++++++++++++++++++++++-------------------------
 1 file changed, 311 insertions(+), 309 deletions(-)

(limited to 'docs/scaffolding.html')

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index e43b4db30..dca452fd1 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -78,35 +78,35 @@
   
    
 
 
+
    
 
-
    
-
+  
    
 
-  
-  
    
-    
    
-      
-    
    
-    
    
+    
+    
    
+      
    
+        
+      
    
+      
    
 
 
 
-      
-      
    
-        
    
-          
    Global styles for CSS reset, typography, and links
    
-        
    
+        
+        
    
+          
    
+            
    Global styles for CSS reset, typography, and links
    
+          
    
 
-        
    Requires HTML5 doctype
    
-        
    Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.
    
+          
    Requires HTML5 doctype
    
+          
    Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.
    
 
     <!DOCTYPE html>
 <html lang="en">
@@ -114,84 +114,84 @@
 </html>
 
    
 
-        
    Typography and links
    
-        
    Bootstrap sets basic global display, typography, and link styles. Specifically, we:
    
-        
      
-          
    • Remove margin on the body
      • 
-          
    • Set background-color: white; on the body
      • 
-          
    • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
      • 
-          
    • Set the global link color via @linkColor and apply link underlines only on :hover
      • 
-        
    
-        
    These styles can be found within scaffolding.less.
    
+          
    Typography and links
    
+          
    Bootstrap sets basic global display, typography, and link styles. Specifically, we:
    
+          
      
+            
    • Remove margin on the body
      • 
+            
    • Set background-color: white; on the body
      • 
+            
    • Use the @baseFontFamily, @baseFontSize, and @baseLineHeight attributes as our typographyic base
      • 
+            
    • Set the global link color via @linkColor and apply link underlines only on :hover
      • 
+          
    
+          
    These styles can be found within scaffolding.less.
    
 
-        
    Reset via Normalize
    
-        
    With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.
    
+          
    Reset via Normalize
    
+          
    With Bootstrap 2, the old reset block has been dropped in favor of Normalize.css, a project by Nicolas Gallagher that also powers the HTML5 Boilerplate. While we use much of Normalize within our reset.less, we have removed some elements specifically for Bootstrap.
    
 
-      
    
+        
    
 
 
 
 
-      
-      
    
-        
    
-          
    Default grid system 12 columns with a responsive twist
    
-        
    
-
-        
    Live grid example
    
-        
    The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.
    
-        
    
-          
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-            
    1
    
-          
    
-          
    
-            
    2
    
-            
    3
    
-            
    4
    
-          
    
-          
    
-            
    4
    
-            
    5
    
+        
+        
    
+          
    
+            
    Default grid system 12 columns with a responsive twist
    
           
    
-          
    
-            
    9
    
+
+          
    Live grid example
    
+          
    The default Bootstrap grid system utilizes 12 columns, making for a 940px wide container without responsive features enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.
    
+          
    
+            
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+              
    1
    
+            
    
+            
    
+              
    2
    
+              
    3
    
+              
    4
    
+            
    
+            
    
+              
    4
    
+              
    5
    
+            
    
+            
    
+              
    9
    
+            
    
           
    
-        
    
 
-        
    Basic grid HTML
    
-        
    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).
    
+          
    Basic grid HTML
    
+          
    For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).
    
 
     <div class="row">
   <div class="span4">...</div>
   <div class="span8">...</div>
 </div>
 
    
-        
    Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.
    
-
-        
    Offsetting columns
    
-        
    Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.
    
-        
    
-          
    
-            
    4
    
-            
    3 offset 2
    
-          
    
-          
    
-            
    3 offset 1
    
-            
    3 offset 2
    
-          
    
-          
    
-            
    6 offset 3
    
-          
    
-        
    
+          
    Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.
    
+
+          
    Offsetting columns
    
+          
    Move columns to the left using .offset* classes. Each class increases the left margin of a column by a whole column. For example, .offset4 moves .span4 over four columns.
    
+          
    
+            
    
+              
    4
    
+              
    3 offset 2
    
+            
    
+            
    
+              
    3 offset 1
    
+              
    3 offset 2
    
+            
    
+            
    
+              
    6 offset 3
    
+            
    
+          
    
 
     <div class="row">
   <div class="span4">...</div>
@@ -199,7 +199,7 @@
 </div>
 
    
 
-        
    Nesting columns
    
+          
    Nesting columns
    
           
    To nest your content with the default grid, add a new .row and set of .span* columns within an existing .span* column. Nested rows should include a set of columns that add up to the number of columns of its parent.
    
           
    Example
    
           
    Here two nested .span4 columns are placed within a .span8.
    
@@ -227,54 +227,54 @@
   </div>
 </div>
    - + - -
    -
    -

    Fluid grid system 12 responsive, percent-based 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
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    1
    -
    -
    -
    4
    -
    4
    -
    4
    -
    -
    -
    4
    -
    8
    + +
    +
    +

    Fluid grid system 12 responsive, percent-based columns

    -
    -
    6
    -
    6
    -
    -
    -
    12
    + +

    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
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    1
    +
    +
    +
    4
    +
    4
    +
    4
    +
    +
    +
    4
    +
    8
    +
    +
    +
    6
    +
    6
    +
    +
    +
    12
    +
    -
    -

    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.

    +

    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>
@@ -282,21 +282,21 @@
 </div>
    -

    Fluid offsetting

    -

    Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

    -
    -
    -
    4
    -
    4 offset 4
    -
    -
    -
    3 offset 3
    -
    3 offset 3
    -
    -
    -
    6 offset 6
    -
    -
    +

    Fluid offsetting

    +

    Operates the same way as the fixed grid system offsetting: add .offset* to any column to offset by that many columns.

    +
    +
    +
    4
    +
    4 offset 4
    +
    +
    +
    3 offset 3
    +
    3 offset 3
    +
    +
    +
    6 offset 6
    +
    + 
     <div class="row-fluid">
   <div class="span4">...</div>
@@ -304,21 +304,21 @@
 </div>
    -

    Fluid nesting

    -

    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 -
    -
    - Fluid 6 -
    -
    - Fluid 6 +

    Fluid nesting

    +

    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 +
    +
    + Fluid 6 +
    +
    + Fluid 6 +
    - 
     <div class="row-fluid">
   <div class="span12">
@@ -331,23 +331,23 @@
 </div>
    -
    +
    - -
    -
    -

    Layouts Basic templates to create webpages

    -
    + +
    +
    +

    Layouts Basic templates to create webpages

    +
    -

    Fixed layout

    -

    Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

    -
    -
    -
    +

    Fixed layout

    +

    Provides a common fixed-width (and optionally responsive) layout with only <div class="container"> required.

    +
    +
    + 
     <body>
   <div class="container">
@@ -356,12 +356,12 @@
 </body>
    -

    Fluid layout

    -

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

    -
    -
    -
    -
    +

    Fluid layout

    +

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

    +
    +
    +
    + 
     <div class="container-fluid">
   <div class="row-fluid">
@@ -374,78 +374,78 @@
   </div>
 </div>
    -
    +
    - -
    -
    -

    Responsive design Media queries for various devices and resolutions

    -
    + +
    +
    +

    Responsive design Media queries for various devices and resolutions

    +
    -

    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.

    +

    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.

    -
      -
    • Modify the width of column in our grid
      • -
    • Stack elements instead of float wherever necessary
      • -
    • Resize headings and text to be more appropriate for devices
      • -
    -

    Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

    - -

    Supported devices

    -

    Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LabelLayout widthColumn widthGutter width
    Phones480px and belowFluid columns, no fixed widths
    Phones to tablets767px and belowFluid columns, no fixed widths
    Portrait tablets768px and above42px20px
    Default980px and up60px20px
    Large display1200px and up70px30px
    +

    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.

    +
      +
    • Modify the width of column in our grid
      • +
    • Stack elements instead of float wherever necessary
      • +
    • Resize headings and text to be more appropriate for devices
      • +
    +

    Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.

    + +

    Supported devices

    +

    Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LabelLayout widthColumn widthGutter width
    Phones480px and belowFluid columns, no fixed widths
    Phones to tablets767px and belowFluid columns, no fixed widths
    Portrait tablets768px and above42px20px
    Default980px and up60px20px
    Large display1200px and up70px30px
     /* Landscape phones and down */
 @media (max-width: 480px) { ... }
@@ -461,82 +461,84 @@
    -

    Responsive utility classes

    -

    For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
    .visible-phoneVisible
    .visible-tabletVisible
    .visible-desktopVisible
    .hidden-phoneVisibleVisible
    .hidden-tabletVisibleVisible
    .hidden-desktopVisibleVisible
    - -

    When to use

    -

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

    - -

    Responsive utilities test case

    -

    Resize your browser or load on different devices to test the above classes.

    -

    Visible on...

    -

    Green checkmarks indicate that class is visible in your current viewport.

    -
      -
    • Phone✔ Phone
      • -
    • Tablet✔ Tablet
      • -
    • Desktop✔ Desktop
      • -
    -

    Hidden on...

    -

    Here, green checkmarks indicate that class is hidden in your current viewport.

    -
      -
    • Phone✔ Phone
      • -
    • Tablet✔ Tablet
      • -
    • Desktop✔ Desktop
      • -
    - -
    +

    Responsive utility classes

    +

    For faster mobile-friendly development, use these utility classes for showing and hiding content by device. Below is a table of the available classes and their effect on a given media query layout (labeled by device). They can be found in responsive.less.

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ClassPhones 767px and belowTablets 979px to 768pxDesktops Default
    .visible-phoneVisible
    .visible-tabletVisible
    .visible-desktopVisible
    .hidden-phoneVisibleVisible
    .hidden-tabletVisibleVisible
    .hidden-desktopVisibleVisible
    + +

    When to use

    +

    Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.

    + +

    Responsive utilities test case

    +

    Resize your browser or load on different devices to test the above classes.

    +

    Visible on...

    +

    Green checkmarks indicate that class is visible in your current viewport.

    +
      +
    • Phone✔ Phone
      • +
    • Tablet✔ Tablet
      • +
    • Desktop✔ Desktop
      • +
    +

    Hidden on...

    +

    Here, green checkmarks indicate that class is hidden in your current viewport.

    +
      +
    • Phone✔ Phone
      • +
    • Tablet✔ Tablet
      • +
    • Desktop✔ Desktop
      • +
    + +
    + + -- cgit v1.2.3 From e38fa4b1f40b8e8f64ad904fd5ea3d6d7ab9dffc Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Jul 2012 00:30:58 -0700 Subject: fix scroll thinggg --- docs/scaffolding.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index b686d3c7c..c36aa6d59 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -86,7 +86,7 @@ ================================================== -->
    -
      +
      • Global styles
      • Grid system
      • Fluid grid system
        • -- cgit v1.2.3 From b7b4fd5c82ea321da3d7858e223eb6adcd225672 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jul 2012 01:53:32 -0700 Subject: wrap footer in bs docs canvas for scrolling doodad --- docs/scaffolding.html | 76 ++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 37 deletions(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index c36aa6d59..791208845 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -541,48 +541,50 @@
    -
    - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From a30045daef809edf5ed592ad842c04377898e444 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 00:30:15 -0700 Subject: reverse navbar styles to save code --- docs/scaffolding.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/scaffolding.html') diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 791208845..3c49eb2e3 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -31,7 +31,7 @@ -
    +