diff options
Diffstat (limited to 'docs/layout')
| -rw-r--r-- | docs/layout/grid.md | 30 | ||||
| -rw-r--r-- | docs/layout/overview.md | 2 | ||||
| -rw-r--r-- | docs/layout/scaffolding.md | 50 |
3 files changed, 16 insertions, 66 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 426cf412c..802a9a142 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -48,7 +48,7 @@ If you're using Bootstrap's compiled CSS, this the example you'll want to start </div> {% endexample %} -The above example creates three equal-width columns on small, medium, large, and extra large devices using our [predefined grid classes](). Those columns are centered in the page with the parent `.container`. +The above example creates three equal-width columns on small, medium, large, and extra large devices using our [predefined grid classes](#predefined-classes). Those columns are centered in the page with the parent `.container`. ## Grid options @@ -59,24 +59,24 @@ See how aspects of the Bootstrap grid system work across multiple devices with a <thead> <tr> <th></th> - <th> - Extra small + <th class="text-center"> + Extra small<br> <small><34em / 480px</small> </th> - <th> - Small + <th class="text-center"> + Small<br> <small>≥34em / 480px</small> </th> - <th> - Medium + <th class="text-center"> + Medium<br> <small>≥45em / 720px</small> </th> - <th> - Large + <th class="text-center"> + Large<br> <small>≥62em / 992px</small> </th> - <th> - Extra large + <th class="text-center"> + Extra large<br> <small>≥75em / 1200px</small> </th> </tr> @@ -129,7 +129,7 @@ See how aspects of the Bootstrap grid system work across multiple devices with a ## Sass mixins -When using Bootstrap's source Sass files, you have the option of using Sass variables and mixins to create custom, semantic, and responsive page layouts. Our [prebuilt grid classes](#example-stacked-to-horizontal) use these same variables and mixins to provide a whole suite of ready-to-use classes for fast responsive layouts. +When using Bootstrap's source Sass files, you have the option of using Sass variables and mixins to create custom, semantic, and responsive page layouts. Our [predefined grid classes](#predefined-classes) use these same variables and mixins to provide a whole suite of ready-to-use classes for fast responsive layouts. ### Variables @@ -195,7 +195,7 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS You can modify the variables to your own custom values, or just use the mixins with their default values. Here's an example of using the default settings to create a two-column layout with a gap between. -See it in action in <a href="http://jsbin.com/qiqet/3/edit">this rendered example</a>. +See it in action in <a href="http://jsbin.com/ruxona/edit">this rendered example</a>. {% highlight scss %} .container { @@ -317,7 +317,7 @@ Build on the previous example by creating even more dynamic and powerful layouts <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> <!-- Optional: clear the XS cols if their content doesn't match in height --> - <div class="clearfix visible-xs-block"></div> + <div class="clearfix hidden-sm-up"></div> <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> </div> {% endexample %} @@ -348,7 +348,7 @@ With the four tiers of grids available you're bound to run into issues where, at <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> <!-- Add the extra clearfix for only the required viewport --> - <div class="clearfix visible-xs-block"></div> + <div class="clearfix hidden-sm-up"></div> <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 75347e527..0f2a09bf0 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -9,7 +9,7 @@ Bootstrap includes several components and options for laying out your project, i ## Containers -Containers are the most basic layout element in Bootstrap and are **required when using our grid system**. Choose from a responsive, fixed-width container (meaning it's `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). +Containers are the most basic layout element in Bootstrap and are **required when using our grid system**. Choose from a responsive, fixed-width container (meaning its `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). While containers *can* be nested, most layouts do not require a nested container. diff --git a/docs/layout/scaffolding.md b/docs/layout/scaffolding.md deleted file mode 100644 index ea5537ef4..000000000 --- a/docs/layout/scaffolding.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -layout: docs -title: Scaffolding -group: layout ---- - -The scaffolding of Bootstrap refers to our general approach to building the project. It outlines the basic document requirements and project dependencies. - -Bootstrap's general approach to writing HTML, CSS, and JavaScript, as well as our core settings, is referred to as scaffolding. This includes required responsive and cross browser enhancements, dependencies, and more. - -## Contents - -* Will be replaced with the ToC, excluding the "Contents" header -{:toc} - -## 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. - -{% highlight html %} -<!DOCTYPE html> -<html lang="en"> - ... -</html> -{% endhighlight %} - -## Mobile first - -Bootstrap is developed *mobile first*, a strategy in which we optimize code for mobile devices first and then scale up components as necessary using CSS media queries. - -To ensure proper rendering and touch zooming, **add the viewport meta tag** to your `<head>`. - -{% highlight html %} -<meta name="viewport" content="width=device-width, initial-scale=1"> -{% endhighlight %} - -## Normalize - -For improved cross-browser rendering, we use [Normalize.css](http://necolas.github.io/normalize.css/) to correct small inconsistencies across browsers and devices. - -## Important CSS resets - -Still need to do this section. Should port the third party section about box sizing and edit it for here, then add the rest of the list items. - -Will also require rearranging the scaffolding.less file. - -- Box sizing -- Form elements and their fonts -- Global link colors -- Responsive images |