diff options
| author | Mark Otto <[email protected]> | 2017-09-09 17:39:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-09-09 17:39:56 -0700 |
| commit | 9cd634fb46c261f731709b0ab2728d2fc35b8ec4 (patch) | |
| tree | 5ca4a40b3154eda545d09a428d974b96c85bd64c /docs/4.0/getting-started | |
| parent | 6df1f5338b38ee7d6675ae179b865d14ea099df6 (diff) | |
| parent | 1abafb36fed3842b050637fc6cedcad45480d8fb (diff) | |
| download | bootstrap-9cd634fb46c261f731709b0ab2728d2fc35b8ec4.tar.xz bootstrap-9cd634fb46c261f731709b0ab2728d2fc35b8ec4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/4.0/getting-started')
| -rw-r--r-- | docs/4.0/getting-started/introduction.md | 2 | ||||
| -rw-r--r-- | docs/4.0/getting-started/options.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/4.0/getting-started/introduction.md b/docs/4.0/getting-started/introduction.md index 08dd83209..4035ae8f4 100644 --- a/docs/4.0/getting-started/introduction.md +++ b/docs/4.0/getting-started/introduction.md @@ -97,7 +97,7 @@ On the rare occasion you need to override it, use something like the following: } {% endhighlight %} -With the above snippet, nested elements—including generated content via `:before` and `:after`—will all inherit the specified `box-sizing` for that `.selector-for-some-widget`. +With the above snippet, nested elements—including generated content via `::before` and `::after`—will all inherit the specified `box-sizing` for that `.selector-for-some-widget`. Learn more about [box model and sizing at CSS Tricks](https://css-tricks.com/box-sizing/). diff --git a/docs/4.0/getting-started/options.md b/docs/4.0/getting-started/options.md index 0b83c47f8..2547ef1ad 100644 --- a/docs/4.0/getting-started/options.md +++ b/docs/4.0/getting-started/options.md @@ -46,11 +46,11 @@ All colors available in Bootstrap 4, available as Sass variables and a Sass map <div class="row"> {% for color in site.data.colors %} + {% unless color.name == "white" or color.name == "gray" or color.name == "gray-dark" %} <div class="col-md-4"> - {% unless color.name == "white" or color.name == "gray" or color.name == "gray-dark" %} <div class="p-3 mb-3 swatch-{{ color.name }}">{{ color.name | capitalize }}</div> - {% endunless %} </div> + {% endunless %} {% endfor %} </div> |
