aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-27 22:16:44 -0700
committerMark Otto <[email protected]>2017-05-27 22:16:44 -0700
commit968c0c69719f6835e4952fafcdb0a618babee3e1 (patch)
tree65a1e87a7f2a580df4b21295359559c42ffaf46c /docs
parentfdf4b7be5f7b7b762abb463fe82bf81fd8206ea5 (diff)
downloadbootstrap-968c0c69719f6835e4952fafcdb0a618babee3e1.tar.xz
bootstrap-968c0c69719f6835e4952fafcdb0a618babee3e1.zip
update content docs
Diffstat (limited to 'docs')
-rw-r--r--docs/content/code.md8
-rw-r--r--docs/content/images.md10
-rw-r--r--docs/content/reboot.md12
-rw-r--r--docs/content/tables.md12
-rw-r--r--docs/content/typography.md12
5 files changed, 13 insertions, 41 deletions
diff --git a/docs/content/code.md b/docs/content/code.md
index a62e0845f..ddd7b9031 100644
--- a/docs/content/code.md
+++ b/docs/content/code.md
@@ -3,15 +3,9 @@ layout: docs
title: Code
description: Documentation and examples for displaying inline and multiline blocks of code with Bootstrap.
group: content
+toc: true
---
-Styles for inline code snippets and longer, multiline blocks of code.
-
-## Contents
-
-* Will be replaced with the ToC, excluding the "Contents" header
-{:toc}
-
## Inline code
Wrap inline snippets of code with `<code>`. Be sure to escape HTML angle brackets.
diff --git a/docs/content/images.md b/docs/content/images.md
index a89206488..dc4ce9a9a 100644
--- a/docs/content/images.md
+++ b/docs/content/images.md
@@ -1,17 +1,11 @@
---
layout: docs
title: Images
-description: Documentation and examples for styling images with Bootstrap.
+description: Documentation and examples for opting images into responsive behavior (so they never become larger than their parent elements) and add lightweight styles to them—all via classes.
group: content
+toc: true
---
-Opt your images into responsive behavior (so they never become larger than their parent elements) and add lightweight styles to them—all via classes.
-
-## Contents
-
-* Will be replaced with the ToC, excluding the "Contents" header
-{:toc}
-
## Responsive images
Images in Bootstrap are made responsive with `.img-fluid`. `max-width: 100%;` and `height: auto;` are applied to the image so that it scales with the parent element.
diff --git a/docs/content/reboot.md b/docs/content/reboot.md
index ab65fe172..e896d5026 100644
--- a/docs/content/reboot.md
+++ b/docs/content/reboot.md
@@ -1,22 +1,16 @@
---
layout: docs
title: Reboot
-description: Documentation and examples for Reboot, Bootstrap's collection of element-specific CSS that heavily builds on Normalize.css.
+description: Reboot, a collection of element-specific CSS changes in a single file, kickstart Bootstrap to provide an elegant, consistent, and simple baseline to build upon.
group: content
redirect_from: "/content/"
+toc: true
---
-Part of Bootstrap's job is to provide an elegant, consistent, and simple baseline to build upon. We use Reboot, a collection of element-specific CSS changes in a single file, to kickstart that.
+## Approach
Reboot builds upon Normalize, providing many HTML elements with somewhat opinionated styles using only element selectors. Additional styling is done only with classes. For example, we reboot some `<table>` styles for a simpler baseline and later provide `.table`, `.table-bordered`, and more.
-## Contents
-
-* Will be replaced with the ToC, excluding the "Contents" header
-{:toc}
-
-## Approach
-
Here are our guidelines and reasons for choosing what to override in Reboot:
- Update some browser default values to use `rem`s instead of `em`s for scalable component spacing.
diff --git a/docs/content/tables.md b/docs/content/tables.md
index 62579ac69..c7523b839 100644
--- a/docs/content/tables.md
+++ b/docs/content/tables.md
@@ -1,19 +1,15 @@
---
layout: docs
title: Tables
-description: Documentation and examples for styling tables with Bootstrap.
+description: Documentation and examples for opt-in styling of tables (given their prevelant use in JavaScript plugins) with Bootstrap.
group: content
+toc: true
---
-Due to the widespread use of tables across third-party widgets like calendars and date pickers, we've designed our tables to be **opt-in**. Just add the base class `.table` to any `<table>`, then extend with custom styles or our various included modifier classes.
-
-## Contents
-
-* Will be replaced with the ToC, excluding the "Contents" header
-{:toc}
-
## Examples
+Due to the widespread use of tables across third-party widgets like calendars and date pickers, we've designed our tables to be **opt-in**. Just add the base class `.table` to any `<table>`, then extend with custom styles or our various included modifier classes.
+
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 %}
diff --git a/docs/content/typography.md b/docs/content/typography.md
index 4fe5bbe02..249e1392e 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -1,20 +1,14 @@
---
layout: docs
title: Typography
-description: Documentation and examples for Bootstrap typography, including global settings, body text, lists, and more.
+description: Documentation and examples for Bootstrap typography, including global settings, headings, body text, lists, and more.
group: content
+toc: true
---
-Bootstrap includes simple and easily customized typography for headings, body text, lists, and more. For even more control, check out the [textual utility classes]({{ site.baseurl }}/utilities/typography/).
-
-## Contents
-
-* Will be replaced with the ToC, excluding the "Contents" header
-{:toc}
-
## Global settings
-Bootstrap sets basic global display, typography, and link styles. Specifically, we:
+Bootstrap sets basic global display, typography, and link styles. When more control is needed, check out the [textual utility classes]({{ site.baseurl }}/utilities/typography/).
- Use a [native font stack]({{ site.baseurl }}/content/reboot/#native-font-stack) that selects the best `font-family` for each OS and device.
- For a more inclusive and accessible type scale, we assume the browser default root `font-size` (typically 16px) so visitors can customize their browser defaults as needed.