rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Backport #28679.

Browse Source 
* Documentation tweaks
* Remove redundant `col-12` classes
This commit is contained in:
Martijn Cuppens 2019-05-08 18:58:29 +02:00 committed by XhmikosR
parent 36ea7e7421
commit e9d8c1a9dd
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/tests/integration/index.html
View File

@ -13,8 +13,8 @@
<body> <body>
<div class="container"> <div class="container">
<h1>Hello, world!</h1> <h1>Hello, world!</h1>
<div class="col-12"> <div class="mt-5">
<div class="mt-5 mb-3"> <div class="mb-3">
<span>Util.getUID: </span> <span>Util.getUID: </span>
<span id="resultUID"></span> <span id="resultUID"></span>
</div> </div>

4
site/_layouts/docs.html
View File

@ -10,7 +10,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row flex-xl-nowrap"> <div class="row flex-xl-nowrap">
<div class="col-12 col-md-3 col-xl-2 bd-sidebar"> <div class="col-md-3 col-xl-2 bd-sidebar">
{% include docs-sidebar.html %} {% include docs-sidebar.html %}
</div> </div>
@ -20,7 +20,7 @@
</nav> </nav>
{% endif %} {% endif %}
<main class="col-12 col-md-9 col-xl-8 py-md-3 pl-md-5 bd-content" role="main"> <main class="col-md-9 col-xl-8 py-md-3 pl-md-5 bd-content" role="main">
<h1 class="bd-title" id="content">{{ page.title | smartify }}</h1> <h1 class="bd-title" id="content">{{ page.title | smartify }}</h1>
<p class="bd-lead">{{ page.description | smartify }}</p> <p class="bd-lead">{{ page.description | smartify }}</p>
{% include ads.html %} {% include ads.html %}

10
site/docs/4.3/examples/grid/index.html
View File

@ -94,10 +94,10 @@ include_js: false
<hr class="my-4"> <hr class="my-4">
<h2 class="mt-4">Mixed: mobile and desktop</h2> <h2 class="mt-4">Mixed: mobile and desktop</h2>
<p>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.</p> <p>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.</p>
<p>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.</p> <p>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.</p>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12 col-md-8 themed-grid-col">.col-12 .col-md-8</div> <div class="col-md-8 themed-grid-col">.col-md-8</div>
<div class="col-6 col-md-4 themed-grid-col">.col-6 .col-md-4</div> <div class="col-6 col-md-4 themed-grid-col">.col-6 .col-md-4</div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
@ -114,7 +114,7 @@ include_js: false
<h2 class="mt-4">Mixed: mobile, tablet, and desktop</h2> <h2 class="mt-4">Mixed: mobile, tablet, and desktop</h2>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12 col-sm-6 col-lg-8 themed-grid-col">.col-12 .col-sm-6 .col-lg-8</div> <div class="col-sm-6 col-lg-8 themed-grid-col">.col-sm-6 .col-lg-8</div>
<div class="col-6 col-lg-4 themed-grid-col">.col-6 .col-lg-4</div> <div class="col-6 col-lg-4 themed-grid-col">.col-6 .col-lg-4</div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
@ -123,4 +123,4 @@ include_js: false
<div class="col-6 col-sm-4 themed-grid-col">.col-6 .col-sm-4</div> <div class="col-6 col-sm-4 themed-grid-col">.col-6 .col-sm-4</div>
</div> </div>
</div> <!-- /container --> </div>

4
site/docs/4.3/layout/grid.md
View File

@ -311,7 +311,7 @@ Don't want your columns to simply stack in some grid tiers? Use a combination of
<div class="container"> <div class="container">
<!-- Stack the columns on mobile by making one full-width and the other half-width --> <!-- Stack the columns on mobile by making one full-width and the other half-width -->
<div class="row"> <div class="row">
<div class="col-12 col-md-8">.col-12 .col-md-8</div> <div class="col-md-8">.col-md-8</div>
<div class="col-6 col-md-4">.col-6 .col-md-4</div> <div class="col-6 col-md-4">.col-6 .col-md-4</div>
</div> </div>
@ -490,7 +490,7 @@ In practice, here's how it looks. Note you can continue to use this with all oth
<div class="bd-example-row"> <div class="bd-example-row">
{% capture example %} {% capture example %}
<div class="row no-gutters"> <div class="row no-gutters">
<div class="col-12 col-sm-6 col-md-8">.col-12 .col-sm-6 .col-md-8</div> <div class="col-sm-6 col-md-8">.col-sm-6 .col-md-8</div>
<div class="col-6 col-md-4">.col-6 .col-md-4</div> <div class="col-6 col-md-4">.col-6 .col-md-4</div>
</div> </div>
{% endcapture %} {% endcapture %}

6
site/index.html
View File

@ -34,7 +34,7 @@ layout: home
</main> </main>
<div class="masthead-followup row m-0 border border-white"> <div class="masthead-followup row m-0 border border-white">
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white"> <div class="col-md-4 p-3 p-md-5 bg-light border border-white">
<!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons --> <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
{% include icons/import.svg width="32" height="32" class="text-primary mb-2" %} {% include icons/import.svg width="32" height="32" class="text-primary mb-2" %}
<h3>Installation</h3> <h3>Installation</h3>
@ -52,7 +52,7 @@ gem install bootstrap -v {{ site.current_ruby_version }}
<a class="btn btn-outline-primary" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/download/">Read installation docs</a> <a class="btn btn-outline-primary" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/download/">Read installation docs</a>
</div> </div>
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white"> <div class="col-md-4 p-3 p-md-5 bg-light border border-white">
<!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons --> <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
{% include icons/download.svg width="32" height="32" class="text-primary mb-2" %} {% include icons/download.svg width="32" height="32" class="text-primary mb-2" %}
<h3>BootstrapCDN</h3> <h3>BootstrapCDN</h3>
@ -73,7 +73,7 @@ gem install bootstrap -v {{ site.current_ruby_version }}
<a class="btn btn-outline-primary" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/layout/overview/">Explore the docs</a> <a class="btn btn-outline-primary" href="{{ site.baseurl }}/docs/{{ site.docs_version }}/layout/overview/">Explore the docs</a>
</div> </div>
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white"> <div class="col-md-4 p-3 p-md-5 bg-light border border-white">
<!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons --> <!-- Icon by Bytesize https://github.com/danklammer/bytesize-icons -->
{% include icons/lightning.svg width="32" height="32" class="text-primary mb-2" %} {% include icons/lightning.svg width="32" height="32" class="text-primary mb-2" %}
<h3>Official Themes</h3> <h3>Official Themes</h3>