aboutsummaryrefslogtreecommitdiff
path: root/docs/content
diff options
context:
space:
mode:
Diffstat (limited to 'docs/content')
-rw-r--r--docs/content/images.md8
-rw-r--r--docs/content/typography.md44
2 files changed, 41 insertions, 11 deletions
diff --git a/docs/content/images.md b/docs/content/images.md
index a72f0041b..1f9abc982 100644
--- a/docs/content/images.md
+++ b/docs/content/images.md
@@ -13,20 +13,20 @@ Opt your images into responsive behavior (so they never become larger than their
## Responsive images
-Images in Bootstrap are made responsive with `.img-responsive`. `max-width: 100%;` and `height: auto;` are applied to the image so that it scales with the parent element.
+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.
<div class="bd-example">
- <img data-src="holder.js/100%x250" class="img-responsive" alt="Generic responsive image">
+ <img data-src="holder.js/100px250" class="img-fluid" alt="Generic responsive image">
</div>
{% highlight html %}
-<img src="..." class="img-responsive" alt="Responsive image">
+<img src="..." class="img-fluid" alt="Responsive image">
{% endhighlight %}
{% callout warning %}
#### SVG images and IE 9-10
-In Internet Explorer 9-10, SVG images with `.img-responsive` are disproportionately sized. To fix this, add `width: 100% \9;` where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.
+In Internet Explorer 9-10, SVG images with `.img-fluid` are disproportionately sized. To fix this, add `width: 100% \9;` where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.
{% endcallout %}
## Image shapes
diff --git a/docs/content/typography.md b/docs/content/typography.md
index 082a87ec9..e97593e2e 100644
--- a/docs/content/typography.md
+++ b/docs/content/typography.md
@@ -85,26 +85,26 @@ Traditional heading elements are designed to work best in the meat of your page
<table class="table">
<tbody>
<tr>
- <td><h1 class="display-4">Display 4</h1></td>
+ <td><h1 class="display-1">Display 1</h1></td>
</tr>
<tr>
- <td><h1 class="display-3">Display 3</h1></td>
+ <td><h1 class="display-2">Display 2</h1></td>
</tr>
<tr>
- <td><h1 class="display-2">Display 2</h1></td>
+ <td><h1 class="display-3">Display 3</h1></td>
</tr>
<tr>
- <td><h1 class="display-1">Display 1</h1></td>
+ <td><h1 class="display-4">Display 4</h1></td>
</tr>
</tbody>
</table>
</div>
{% highlight html %}
-<h1 class="display-4">Display 4</h1>
-<h1 class="display-3">Display 3</h1>
-<h1 class="display-2">Display 2</h1>
<h1 class="display-1">Display 1</h1>
+<h1 class="display-2">Display 2</h1>
+<h1 class="display-3">Display 3</h1>
+<h1 class="display-4">Display 4</h1>
{% endhighlight %}
## Lead
@@ -235,3 +235,33 @@ Align terms and descriptions horizontally by using our grid system's predefined
<dd class="col-sm-9">Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
</dl>
{% endexample %}
+
+## Responsive typography
+
+*Responsive typography* refers to scaling text and components by simply adjusting the root element's `font-size` within a series of media queries. Bootstrap doesn't do this for you, but it's fairly easy to add if you need it.
+
+Here's an example of it in practice. Choose whatever `font-size`s and media queries you wish.
+
+{% highlight scss %}
+html {
+ font-size: 14px;
+}
+
+@include media-breakpoint-up(sm) {
+ html {
+ font-size: 16px;
+ }
+}
+
+@include media-breakpoint-up(md) {
+ html {
+ font-size: 20px;
+ }
+}
+
+@include media-breakpoint-up(lg) {
+ html {
+ font-size: 28px;
+ }
+}
+{% endhighlight %}