From e9d8c1a9ddb6a6f12e377b557126137f10b24232 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Wed, 8 May 2019 18:58:29 +0200 Subject: [PATCH] Backport #28679. * Documentation tweaks * Remove redundant `col-12` classes --- js/tests/integration/index.html | 4 ++-- site/_layouts/docs.html | 4 ++-- site/docs/4.3/examples/grid/index.html | 10 +++++----- site/docs/4.3/layout/grid.md | 4 ++-- site/index.html | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/tests/integration/index.html b/js/tests/integration/index.html index e5b33a84dc..f82ddbebe5 100644 --- a/js/tests/integration/index.html +++ b/js/tests/integration/index.html @@ -13,8 +13,8 @@

Hello, world!

-
-
+
+
Util.getUID:
diff --git a/site/_layouts/docs.html b/site/_layouts/docs.html index cc4910c041..b9381923bc 100644 --- a/site/_layouts/docs.html +++ b/site/_layouts/docs.html @@ -10,7 +10,7 @@
-
+
{% include docs-sidebar.html %}
@@ -20,7 +20,7 @@ {% endif %} -
+

{{ page.title | smartify }}

{{ page.description | smartify }}

{% include ads.html %} diff --git a/site/docs/4.3/examples/grid/index.html b/site/docs/4.3/examples/grid/index.html index b41090438d..9ea83e4460 100644 --- a/site/docs/4.3/examples/grid/index.html +++ b/site/docs/4.3/examples/grid/index.html @@ -94,10 +94,10 @@ include_js: false

Mixed: mobile and desktop

-

The Bootstrap v4 grid system has five tiers of classes: xs (extra small), sm (small), md (medium), lg (large), and xl (extra large). You can use nearly any combination of these classes to create more dynamic and flexible layouts.

-

Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.

+

The Bootstrap v4 grid system has five tiers of classes: xs (extra small, this class infix is not used), sm (small), md (medium), lg (large), and xl (extra large). You can use nearly any combination of these classes to create more dynamic and flexible layouts.

+

Each tier of classes scales up, meaning if you plan on setting the same widths for md, lg and xl, you only need to specify md.

-
.col-12 .col-md-8
+
.col-md-8
.col-6 .col-md-4
@@ -114,7 +114,7 @@ include_js: false

Mixed: mobile, tablet, and desktop

-
.col-12 .col-sm-6 .col-lg-8
+
.col-sm-6 .col-lg-8
.col-6 .col-lg-4
@@ -123,4 +123,4 @@ include_js: false
.col-6 .col-sm-4
-
+
diff --git a/site/docs/4.3/layout/grid.md b/site/docs/4.3/layout/grid.md index a6f4ac5ab4..4cad4ac3bd 100644 --- a/site/docs/4.3/layout/grid.md +++ b/site/docs/4.3/layout/grid.md @@ -311,7 +311,7 @@ Don't want your columns to simply stack in some grid tiers? Use a combination of
-
.col-12 .col-md-8
+
.col-md-8
.col-6 .col-md-4
@@ -490,7 +490,7 @@ In practice, here's how it looks. Note you can continue to use this with all oth
{% capture example %}
-
.col-12 .col-sm-6 .col-md-8
+
.col-sm-6 .col-md-8
.col-6 .col-md-4
{% endcapture %} diff --git a/site/index.html b/site/index.html index df50c7291c..9c284c991c 100644 --- a/site/index.html +++ b/site/index.html @@ -34,7 +34,7 @@ layout: home
-
+
{% include icons/import.svg width="32" height="32" class="text-primary mb-2" %}

Installation

@@ -52,7 +52,7 @@ gem install bootstrap -v {{ site.current_ruby_version }} Read installation docs
-
+
{% include icons/download.svg width="32" height="32" class="text-primary mb-2" %}

BootstrapCDN

@@ -73,7 +73,7 @@ gem install bootstrap -v {{ site.current_ruby_version }} Explore the docs
-
+
{% include icons/lightning.svg width="32" height="32" class="text-primary mb-2" %}

Official Themes