diff options
| author | Mark Otto <[email protected]> | 2016-10-02 19:26:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-02 19:26:29 -0700 |
| commit | 1db3586dc0798485d5ca82a9b8de477e82ba351c (patch) | |
| tree | 721b7f5c2e901c100e758b8b1ad7c2f820124fbc /docs/content | |
| parent | d11c93341f392d654b2cb5cbefd399bbf1d81f00 (diff) | |
| parent | 4699fd4b4076f325652a5f51cd0c734d900faac3 (diff) | |
| download | bootstrap-1db3586dc0798485d5ca82a9b8de477e82ba351c.tar.xz bootstrap-1db3586dc0798485d5ca82a9b8de477e82ba351c.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/content')
| -rw-r--r-- | docs/content/code.md | 1 | ||||
| -rw-r--r-- | docs/content/figures.md | 3 | ||||
| -rw-r--r-- | docs/content/images.md | 1 | ||||
| -rw-r--r-- | docs/content/reboot.md | 1 | ||||
| -rw-r--r-- | docs/content/tables.md | 3 | ||||
| -rw-r--r-- | docs/content/typography.md | 1 |
6 files changed, 8 insertions, 2 deletions
diff --git a/docs/content/code.md b/docs/content/code.md index 79059a1d1..a62e0845f 100644 --- a/docs/content/code.md +++ b/docs/content/code.md @@ -1,6 +1,7 @@ --- layout: docs title: Code +description: Documentation and examples for displaying inline and multiline blocks of code with Bootstrap. group: content --- diff --git a/docs/content/figures.md b/docs/content/figures.md index d57270518..c24b5b2c8 100644 --- a/docs/content/figures.md +++ b/docs/content/figures.md @@ -1,10 +1,11 @@ --- layout: docs title: Figures +description: Documentation and examples for displaying related images and text with the figure component in Bootstrap. group: content --- -Anytime you need to display a piece of content—like an image—with an optional caption, consider using a `<figure>`. +Anytime you need to display a piece of content—like an image with an optional caption, consider using a `<figure>`. Use the included `.figure` , `.figure-img` and `.figure-caption` classes to provide some baseline styles for the HTML5 `<figure>` and `<figcaption>` elements. Images in figures have no explicit size, so be sure to add the `.img-fluid` class to your `<img>` to make it responsive. diff --git a/docs/content/images.md b/docs/content/images.md index f21010f0f..48a5dd3d4 100644 --- a/docs/content/images.md +++ b/docs/content/images.md @@ -1,6 +1,7 @@ --- layout: docs title: Images +description: Documentation and examples for styling images with Bootstrap. group: content --- diff --git a/docs/content/reboot.md b/docs/content/reboot.md index a6815e9db..1d93cc9ce 100644 --- a/docs/content/reboot.md +++ b/docs/content/reboot.md @@ -1,6 +1,7 @@ --- layout: docs title: Reboot +description: Documentation and examples for Reboot, Bootstrap's collection of element-specific CSS that builds on Normalize.css. group: content redirect_from: "/content/" --- diff --git a/docs/content/tables.md b/docs/content/tables.md index 3b4d58b36..f2741b734 100644 --- a/docs/content/tables.md +++ b/docs/content/tables.md @@ -1,6 +1,7 @@ --- layout: docs title: Tables +description: Documentation and examples for styling tables with Bootstrap. group: content --- @@ -13,7 +14,7 @@ Due to the widespread use of tables across third-party widgets like calendars an ## Examples -Using the most basic table markup, here's how `.table`-based tables look in Bootstrap. +Using the most basic table markup, here's how `.table`-based tables look in Bootstrap. **All table styles are inherited in Bootstrap 4**, meaning any nested tables will be styled in the same manner as the parent. {% example html %} <table class="table"> diff --git a/docs/content/typography.md b/docs/content/typography.md index a59f50347..f9b5913d2 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -1,6 +1,7 @@ --- layout: docs title: Typography +description: Documentation and examples for Bootstrap typography, including global settings, body text, lists, and more. group: content --- |
