diff options
| author | Mark Otto <[email protected]> | 2017-08-10 20:46:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-08-10 20:46:25 -0700 |
| commit | 0356a1417a7725b7eb4bbb37fc807b229dd20a5d (patch) | |
| tree | b7e7ef7ddcc6a39717157d32ab7b759cd8b093ee /docs | |
| parent | 39d53b09ffeaad474b9b492d239cde5a2a1383fa (diff) | |
| parent | 2f6f0c0fb53f8efec4cae92960546931192e9f6a (diff) | |
| download | bootstrap-0356a1417a7725b7eb4bbb37fc807b229dd20a5d.tar.xz bootstrap-0356a1417a7725b7eb4bbb37fc807b229dd20a5d.zip | |
Merge branch 'new-home' into v4-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/4.0/examples/index.md | 1 | ||||
| -rw-r--r-- | docs/4.0/extend/icons.md | 1 | ||||
| -rw-r--r-- | docs/4.0/utilities/borders.md | 1 | ||||
| -rw-r--r-- | docs/4.0/utilities/colors.md | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/docs/4.0/examples/index.md b/docs/4.0/examples/index.md index dd52fe9bd..bec2f014c 100644 --- a/docs/4.0/examples/index.md +++ b/docs/4.0/examples/index.md @@ -1,6 +1,7 @@ --- layout: simple title: Examples +description: Quickly get a project started with any of our examples ranging from using parts of the framework to custom components and layouts. redirect_from: - /examples/ --- diff --git a/docs/4.0/extend/icons.md b/docs/4.0/extend/icons.md index 3b4aea3eb..f7da1ca83 100644 --- a/docs/4.0/extend/icons.md +++ b/docs/4.0/extend/icons.md @@ -17,6 +17,7 @@ We've tested and used these icon sets ourselves. ## More options While we haven't tried these out, they do look promising and provide multiple formats—including SVG. +- [Bytesize](https://github.com/danklammer/bytesize-icons) - [Google Material icons](https://material.io/icons/) - [Ionicons](http://ionicons.com/) - [Feather](http://colebemis.com/feather/) diff --git a/docs/4.0/utilities/borders.md b/docs/4.0/utilities/borders.md index db8bcee19..fcc064d39 100644 --- a/docs/4.0/utilities/borders.md +++ b/docs/4.0/utilities/borders.md @@ -30,6 +30,7 @@ Change the border color using utilities built on our theme colors. {% example html %} {% for color in site.data.theme-colors %} <span class="border border-{{ color.name }}"></span>{% endfor %} +<span class="border border-white"></span> {% endexample %} </div> diff --git a/docs/4.0/utilities/colors.md b/docs/4.0/utilities/colors.md index 11ac0be60..ed4ba1066 100644 --- a/docs/4.0/utilities/colors.md +++ b/docs/4.0/utilities/colors.md @@ -23,6 +23,7 @@ Similar to the contextual text color classes, easily set the background of an el {% example html %} {% for color in site.data.theme-colors %} <div class="p-3 mb-2 bg-{{ color.name }} {% if color.name == "light" %}text-gray-dark{% else %}text-white{% endif %}">.bg-{{ color.name }}</div>{% endfor %} +<div class="p-3 mb-2 bg-white text-gray-dark">.bg-white</div> {% endexample %} {% callout info %} |