From 5c03882aff3c69ecef083cbf5c6679b2194d7c33 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Thu, 20 Aug 2015 11:48:27 -0400 Subject: Rendered example bin in grid docs should use sass Fix #17129 --- docs/layout/grid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index cd848cf98..6cd837a01 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -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 this rendered example. +See it in action in this rendered example. {% highlight scss %} .container { -- cgit v1.2.3 From cf5284f235cfcfbca606cb2d4cf80958b31ecf7b Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Fri, 21 Aug 2015 08:04:44 -0400 Subject: v4 - Force linebreaks after grid tier names in v4 grid docs Fix #17176 Sorry, I f'd up the rebase in #17186 --- docs/layout/grid.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 426cf412c..e679d7c45 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -59,24 +59,24 @@ See how aspects of the Bootstrap grid system work across multiple devices with a - - Extra small + + Extra small
<34em / 480px - - Small + + Small
≥34em / 480px - - Medium + + Medium
≥45em / 720px - - Large + + Large
≥62em / 992px - - Extra large + + Extra large
≥75em / 1200px -- cgit v1.2.3 From 37c84f144b37040d7af56555ac76a4f678f37812 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 18:51:06 -0700 Subject: nuke that page since it's now unused --- docs/layout/scaffolding.md | 50 ---------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 docs/layout/scaffolding.md (limited to 'docs/layout') 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 %} - - - ... - -{% 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 ``. - -{% highlight html %} - -{% 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 -- cgit v1.2.3 From a1b38092e2f87af519dc4ceb516badf6d2da9677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20K=C5=99=C3=AD=C5=BE?= Date: Mon, 24 Aug 2015 16:30:46 +0200 Subject: Fix anchors, fix naming consistency I found non working anchors and some naming in consistency. I hope I fixed well. Have a nice day. --- docs/layout/grid.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index c6983a62e..a1c7e79f1 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 {% 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 @@ -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 -- cgit v1.2.3 From 1ec0c4935801b4aff947ef2c5ce62fdc7b9904a4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 24 Aug 2015 14:42:21 -0700 Subject: Replace remaining instances of defunct .visible* classes in docs .visible-xs(-block) => .hidden-sm-up Fixes #17263. [skip sauce] --- docs/layout/grid.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index c6983a62e..59ad79d39 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -317,7 +317,7 @@ Build on the previous example by creating even more dynamic and powerful layouts
.col-xs-6 .col-sm-4
.col-xs-6 .col-sm-4
-
+
.col-xs-6 .col-sm-4
{% endexample %} @@ -348,7 +348,7 @@ With the four tiers of grids available you're bound to run into issues where, at
.col-xs-6 .col-sm-3
-
+
.col-xs-6 .col-sm-3
.col-xs-6 .col-sm-3
-- cgit v1.2.3 From 8e29c43c467c25cbb30ca9be0223c08571d54f65 Mon Sep 17 00:00:00 2001 From: Zearin Date: Mon, 7 Sep 2015 10:07:35 -0400 Subject: =?UTF-8?q?Fix=20usage=20of=20=E2=80=9Cits=E2=80=9D=20and=20?= =?UTF-8?q?=E2=80=9Cit=E2=80=99s=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/layout/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') 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. -- cgit v1.2.3