From f3ad4c7183251713eb021a400211cc9b07577080 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 21 Feb 2012 08:24:18 -0800 Subject: [PATCH] adding responsive utility classes and matching docs section with super neato table and test --- docs/assets/bootstrap.zip | Bin 53662 -> 53789 bytes docs/assets/css/bootstrap-responsive.css | 46 +++++++ docs/assets/css/docs.css | 64 +++++++++ docs/scaffolding.html | 161 +++++++++++++++++----- docs/templates/pages/scaffolding.mustache | 161 +++++++++++++++++----- less/responsive.less | 31 +++++ less/scaffolding.less | 6 +- 7 files changed, 390 insertions(+), 79 deletions(-) diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9764009092e7361cfca4910636ed5634c068c2f4..e51e7530627ab125d121e978d41030fb116086fc 100644 GIT binary patch delta 5218 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 diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 9dd71c62d5..90f63b6226 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -21,6 +21,52 @@ display: none; visibility: hidden; } +.visible-phone { + display: none; +} +.visible-tablet { + display: none; +} +.visible-desktop { + display: block; +} +.hidden-phone { + display: block; +} +.hidden-tablet { + display: block; +} +.hidden-desktop { + display: none; +} +@media (max-width: 767px) { + .visible-phone { + display: block; + } + .hidden-phone { + display: none; + } + .hidden-desktop { + display: block; + } + .visible-desktop { + display: none; + } +} +@media (min-width: 768px) and (max-width: 979px) { + .visible-tablet { + display: block; + } + .hidden-tablet { + display: none; + } + .hidden-desktop { + display: block; + } + .visible-desktop { + display: none; + } +} @media (max-width: 480px) { .nav-collapse { -webkit-transform: translate3d(0, 0, 0); diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f5d63f90dc..36da6853ce 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -557,6 +557,70 @@ form.well { background-color: #fff; } +/* Responsive table +------------------------- */ +.responsive-utilities th small { + display: block; + font-weight: normal; + color: #999; +} +.responsive-utilities tbody th { + font-weight: normal; +} +.responsive-utilities td { + text-align: center; +} +.responsive-utilities td.is-visible { + color: #468847; + background-color: #dff0d8 !important; +} +.responsive-utilities td.is-hidden { + color: #ccc; + background-color: #f9f9f9 !important; +} + +/* Responsive tests +------------------------- */ +.responsive-utilities-test { + margin-top: 5px; + margin-left: 0; + list-style: none; + overflow: hidden; /* clear floats */ +} +.responsive-utilities-test li { + position: relative; + float: left; + width: 25%; + height: 43px; + font-size: 14px; + font-weight: bold; + line-height: 43px; + color: #999; + text-align: center; + border: 1px solid #ddd; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.responsive-utilities-test li + li { + margin-left: 10px; +} +.responsive-utilities-test span { + position: absolute; + top: -1px; + left: -1px; + right: -1px; + bottom: -1px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.responsive-utilities-test span { + color: #468847; + background-color: #dff0d8; + border: 1px solid #d6e9c6; +} + /* Responsive Docs -------------------------------------------------- */ diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 97d2bf4c5d..a35012e9c8 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -173,7 +173,7 @@

The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.

It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.

-
+ 
 <div class="row">
@@ -181,11 +181,11 @@
   <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.

-
- + +
@@ -229,7 +229,7 @@ - + 
 <div class="row">
@@ -242,8 +242,8 @@
   </div>
 </div>
-
- + + @@ -291,11 +291,11 @@

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

@@ -304,8 +304,8 @@
   <div class="span8">...</div>
 </div>
-
- + +

Fluid nesting

@@ -324,7 +324,7 @@
- + 
 <div class="row-fluid">
@@ -337,8 +337,8 @@
   </div>
 </div>
-
- + + @@ -385,16 +385,16 @@

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.

-
- + + @@ -421,7 +421,7 @@ </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.

@@ -441,8 +441,8 @@ </div> </div> -
- + + @@ -457,8 +457,16 @@
- Responsive devices -
+

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:

@@ -506,23 +514,15 @@

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

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
    • -
-
- + +

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. @@ -530,8 +530,8 @@
  2. Modify and recompile responsive.less as a separate file

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) { ... }
@@ -545,8 +545,93 @@
   // 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 hidding 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 clases.

+

Visible on...

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

Hidden on...

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
+
+
+ + +
+
+
+
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index bc4953b24d..fff47d4383 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -97,7 +97,7 @@

{{_i}}The default grid system provided as part of Bootstrap is a 940px-wide, 12-column grid.{{/i}}

{{_i}}It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.{{/i}}

-
+ 
 <div class="row">
@@ -105,11 +105,11 @@
   <div class="span8">...</div>
 </div>
-
+

{{_i}}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.{{/i}}

-
- + +
@@ -153,7 +153,7 @@ - + 
 <div class="row">
@@ -166,8 +166,8 @@
   </div>
 </div>
-
- + + @@ -215,11 +215,11 @@

{{_i}}Percents, not pixels{{/i}}

{{_i}}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.{{/i}}

-
+

{{_i}}Fluid rows{{/i}}

{{_i}}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.{{/i}}

-
+

{{_i}}Markup{{/i}}

@@ -228,8 +228,8 @@
   <div class="span8">...</div>
 </div>
-
- + +

{{_i}}Fluid nesting{{/i}}

@@ -248,7 +248,7 @@
- + 
 <div class="row-fluid">
@@ -261,8 +261,8 @@
   </div>
 </div>
-
- + + @@ -309,16 +309,16 @@

{{_i}}Variables in LESS{{/i}}

{{_i}}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.{{/i}}

-
+

{{_i}}How to customize{{/i}}

{{_i}}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.{{/i}}

-
+

{{_i}}Staying responsive{{/i}}

{{_i}}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.{{/i}}

-
- + + @@ -345,7 +345,7 @@ </div> </body> - +

{{_i}}Fluid layout{{/i}}

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

@@ -365,8 +365,8 @@ </div> </div> -
- + + @@ -381,8 +381,16 @@
- Responsive devices -
+

Responsive devices

+

{{_i}}What they do{{/i}}

+

{{_i}}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.{{/i}}

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

{{_i}}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.{{/i}}

+

{{_i}}Supported devices{{/i}}

{{_i}}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:{{/i}}

@@ -430,23 +438,15 @@

{{_i}}Requires meta tag{{/i}}

{{_i}}To ensure devices display responsive pages properly, include the viewport meta tag.{{/i}}

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

{{_i}}What they do{{/i}}

-

{{_i}}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.{{/i}}

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

{{_i}}Using the media queries{{/i}}

-
+

{{_i}}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:{{/i}}

  1. {{_i}}Use the compiled responsive version, bootstrap-responsive.css{{/i}}
    2. @@ -454,8 +454,8 @@
  2. {{_i}}Modify and recompile responsive.less as a separate file{{/i}}

{{_i}}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.{{/i}}

-
-
+
+ 
   // {{_i}}Landscape phones and down{{/i}}
   @media (max-width: 480px) { ... }
@@ -469,6 +469,91 @@
   // {{_i}}Large desktop{{/i}}
   @media (min-width: 1200px) { .. }
-
-
+
+ +
+ + +

{{_i}}Responsive utility classes{{/i}}

+
+
+

{{_i}}What are they{{/i}}

+

{{_i}}For faster mobile-friendly development, use these basic utility classes for showing and hidding content by device.{{/i}}

+

{{_i}}When to use{{/i}}

+

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

+

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

+
+
+

{{_i}}Support classes{{/i}}

+

{{_i}}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.{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Class{{/i}}{{_i}}Phones 480px and below{{/i}}{{_i}}Tablets 767px and below{{/i}}{{_i}}Desktops 768px and above{{/i}}
.visible-phone{{_i}}Visible{{/i}}
.visible-tablet{{_i}}Visible{{/i}}
.visible-desktop{{_i}}Visible{{/i}}
.hidden-phone{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
.hidden-tablet{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
.hidden-desktop{{_i}}Visible{{/i}}{{_i}}Visible{{/i}}
+

{{_i}}Test case{{/i}}

+

{{_i}}Resize your browser or load on different devices to test the above clases.{{/i}}

+

{{_i}}Visible on...{{/i}}

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

{{_i}}Hidden on...{{/i}}

+
    +
  • Phone✔ Phone
    • +
  • Tablet✔ Tablet
    • +
  • Desktop✔ Desktop
    • +
+
+
+ + +
+
+
+
diff --git a/less/responsive.less b/less/responsive.less index 8c39f088e7..9cfb592962 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -31,6 +31,37 @@ visibility: hidden; } +// Visibility utilities + +// For desktops +.visible-phone { display: none; } +.visible-tablet { display: none; } +.visible-desktop { display: block; } +.hidden-phone { display: block; } +.hidden-tablet { display: block; } +.hidden-desktop { display: none; } + +// Phones only +@media (max-width: 767px) { + // Show + .visible-phone { display: block; } + // Hide + .hidden-phone { display: none; } + // Hide everything else + .hidden-desktop { display: block; } + .visible-desktop { display: none; } +} + +// Tablets & small desktops only +@media (min-width: 768px) and (max-width: 979px) { + // Show + .visible-tablet { display: block; } + // Hide + .hidden-tablet { display: none; } + // Hide everything else + .hidden-desktop { display: block; } + .visible-desktop { display: none; } +} // UP TO LANDSCAPE PHONE diff --git a/less/scaffolding.less b/less/scaffolding.less index 47ce53818b..c2e683ac67 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -3,8 +3,8 @@ // ------------------------------------------------------------------------------------------- -// STRUCTURAL LAYOUT -// ----------------- +// Body reset +// ---------- body { margin: 0; @@ -16,7 +16,7 @@ body { } -// LINKS +// Links // ----- a {