Skip to content

Commit

Permalink
Improve Grid examples. (#26808)
Browse files Browse the repository at this point in the history 
Removes the grid.css file of the grid example and makes use of utility classes
  • Loading branch information
@MartijnCuppens @XhmikosR
MartijnCuppens authored and XhmikosR committed Oct 21, 2018
1 parent 3075432 commit 49ca910
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 92 deletions.
27 changes: 3 additions & 24 deletions site/docs/4.1/examples/grid/grid.css
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,6 @@
body {
padding-top: 2rem;
padding-bottom: 2rem;
}

h3 {
margin-top: 2rem;
}

.row {
margin-bottom: 1rem;
}
.row .row {
margin-top: 1rem;
margin-bottom: 0;
}
[class*="col-"] {
padding-top: 1rem;
padding-bottom: 1rem;
.themed-grid-col {
padding-top: 15px;
padding-bottom: 15px;
background-color: rgba(86, 61, 124, .15);
border: 1px solid rgba(86, 61, 124, .2);
}

hr {
margin-top: 2rem;
margin-bottom: 2rem;
}
140 changes: 72 additions & 68 deletions site/docs/4.1/examples/grid/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,118 +16,122 @@
<link href="grid.css" rel="stylesheet">
</head>

<body>
<body class="py-4">
<div class="container">

<h1>Bootstrap grid examples</h1>
<p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
<p>In these examples the <code>.themed-grid-col</code> class is added to the columns to add some theming. This is not a class that is available in Bootstrap by default.</p>

<h2>Five grid tiers</h2>
<h2 class="mt-4">Five grid tiers</h2>
<p>There are five tiers to the Bootstrap grid system, one for each range of devices we support. Each tier starts at a minimum viewport size and automatically applies to the larger devices unless overridden.</p>

<div class="row">
<div class="col-4">.col-4</div>
<div class="col-4">.col-4</div>
<div class="col-4">.col-4</div>
<div class="row mb-3">
<div class="col-4 themed-grid-col">.col-4</div>
<div class="col-4 themed-grid-col">.col-4</div>
<div class="col-4 themed-grid-col">.col-4</div>
</div>

<div class="row">
<div class="col-sm-4">.col-sm-4</div>
<div class="col-sm-4">.col-sm-4</div>
<div class="col-sm-4">.col-sm-4</div>
<div class="row mb-3">
<div class="col-sm-4 themed-grid-col">.col-sm-4</div>
<div class="col-sm-4 themed-grid-col">.col-sm-4</div>
<div class="col-sm-4 themed-grid-col">.col-sm-4</div>
</div>

<div class="row">
<div class="col-md-4">.col-md-4</div>
<div class="col-md-4">.col-md-4</div>
<div class="col-md-4">.col-md-4</div>
<div class="row mb-3">
<div class="col-md-4 themed-grid-col">.col-md-4</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
</div>

<div class="row">
<div class="col-lg-4">.col-lg-4</div>
<div class="col-lg-4">.col-lg-4</div>
<div class="col-lg-4">.col-lg-4</div>
<div class="row mb-3">
<div class="col-lg-4 themed-grid-col">.col-lg-4</div>
<div class="col-lg-4 themed-grid-col">.col-lg-4</div>
<div class="col-lg-4 themed-grid-col">.col-lg-4</div>
</div>

<div class="row">
<div class="col-xl-4">.col-xl-4</div>
<div class="col-xl-4">.col-xl-4</div>
<div class="col-xl-4">.col-xl-4</div>
<div class="row mb-3">
<div class="col-xl-4 themed-grid-col">.col-xl-4</div>
<div class="col-xl-4 themed-grid-col">.col-xl-4</div>
<div class="col-xl-4 themed-grid-col">.col-xl-4</div>
</div>

<h2>Three equal columns</h2>
<h2 class="mt-4">Three equal columns</h2>
<p>Get three equal-width columns <strong>starting at desktops and scaling to large desktops</strong>. On mobile devices, tablets and below, the columns will automatically stack.</p>
<div class="row">
<div class="col-md-4">.col-md-4</div>
<div class="col-md-4">.col-md-4</div>
<div class="col-md-4">.col-md-4</div>
<div class="row mb-3">
<div class="col-md-4 themed-grid-col">.col-md-4</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
</div>

<h2>Three unequal columns</h2>
<h2 class="mt-4">Three unequal columns</h2>
<p>Get three columns <strong>starting at desktops and scaling to large desktops</strong> of various widths. Remember, grid columns should add up to twelve for a single horizontal block. More than that, and columns start stacking no matter the viewport.</p>
<div class="row">
<div class="col-md-3">.col-md-3</div>
<div class="col-md-6">.col-md-6</div>
<div class="col-md-3">.col-md-3</div>
<div class="row mb-3">
<div class="col-md-3 themed-grid-col">.col-md-3</div>
<div class="col-md-6 themed-grid-col">.col-md-6</div>
<div class="col-md-3 themed-grid-col">.col-md-3</div>
</div>

<h2>Two columns</h2>
<h2 class="mt-4">Two columns</h2>
<p>Get two columns <strong>starting at desktops and scaling to large desktops</strong>.</p>
<div class="row">
<div class="col-md-8">.col-md-8</div>
<div class="col-md-4">.col-md-4</div>
<div class="row mb-3">
<div class="col-md-8 themed-grid-col">.col-md-8</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
</div>

<h2>Full width, single column</h2>
<p class="text-warning">No grid classes are necessary for full-width elements.</p>
<h2 class="mt-4">Full width, single column</h2>
<p class="text-warning">
No grid classes are necessary for full-width elements.
</p>

<hr>
<hr class="my-4">

<h2>Two columns with two nested columns</h2>
<h2 class="mt-4">Two columns with two nested columns</h2>
<p>Per the documentation, nesting is easy—just put a row of columns within an existing column. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p>
<p>At mobile device sizes, tablets and down, these columns and their nested columns will stack.</p>
<div class="row">
<div class="col-md-8">
.col-md-8
<div class="row mb-3">
<div class="col-md-8 themed-grid-col">
<div class="pb-3">
.col-md-8
</div>
<div class="row">
<div class="col-md-6">.col-md-6</div>
<div class="col-md-6">.col-md-6</div>
<div class="col-md-6 themed-grid-col">.col-md-6</div>
<div class="col-md-6 themed-grid-col">.col-md-6</div>
</div>
</div>
<div class="col-md-4">.col-md-4</div>
<div class="col-md-4 themed-grid-col">.col-md-4</div>
</div>

<hr>
<hr class="my-4">

<h2>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>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>
<div class="row">
<div class="col-12 col-md-8">.col-12 .col-md-8</div>
<div class="col-6 col-md-4">.col-6 .col-md-4</div>
<div class="row mb-3">
<div class="col-12 col-md-8 themed-grid-col">.col-12 .col-md-8</div>
<div class="col-6 col-md-4 themed-grid-col">.col-6 .col-md-4</div>
</div>
<div class="row">
<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 class="col-6 col-md-4">.col-6 .col-md-4</div>
<div class="row mb-3">
<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 class="col-6 col-md-4 themed-grid-col">.col-6 .col-md-4</div>
</div>
<div class="row">
<div class="col-6">.col-6</div>
<div class="col-6">.col-6</div>
<div class="row mb-3">
<div class="col-6 themed-grid-col">.col-6</div>
<div class="col-6 themed-grid-col">.col-6</div>
</div>

<hr>
<hr class="my-4">

<h2>Mixed: mobile, tablet, and desktop</h2>
<p></p>
<div class="row">
<div class="col-12 col-sm-6 col-lg-8">.col-12 .col-sm-6 .col-lg-8</div>
<div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
<h2 class="mt-4">Mixed: mobile, tablet, and desktop</h2>
<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-6 col-lg-4 themed-grid-col">.col-6 .col-lg-4</div>
</div>
<div class="row">
<div class="col-6 col-sm-4">.col-6 .col-sm-4</div>
<div class="col-6 col-sm-4">.col-6 .col-sm-4</div>
<div class="col-6 col-sm-4">.col-6 .col-sm-4</div>
<div class="row mb-3">
<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 class="col-6 col-sm-4 themed-grid-col">.col-6 .col-sm-4</div>
</div>

</div> <!-- /container -->
Expand Down
Binary file modified site/docs/4.1/examples/screenshots/grid.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 49ca910

Please sign in to comment.