diff options
| author | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
| commit | 64dcb8b5073293daa911d2b274fd875f31693317 (patch) | |
| tree | 112821f9bdd9b51f8953521cc2f34a537ccf74a2 /docs/content | |
| parent | 15f522fd4ae3fe7933d526f045b0b2df22a35291 (diff) | |
| parent | 63129112bbea91f7cd62014f162f857f50084656 (diff) | |
| download | bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.tar.xz bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/content')
| -rw-r--r-- | docs/content/reboot.md | 8 | ||||
| -rw-r--r-- | docs/content/typography.md | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/docs/content/reboot.md b/docs/content/reboot.md index ad8a8a6f6..a6815e9db 100644 --- a/docs/content/reboot.md +++ b/docs/content/reboot.md @@ -46,14 +46,6 @@ $font-family-sans-serif: "Segoe UI", // Android "Roboto", - // Linux - "Oxygen", // KDE - "Ubuntu", - "Cantarell", // GNOME - // Firefox OS [R.I.P.] - "Fira Sans", - // Older Android - "Droid Sans", // Basic web fallback "Helvetica Neue", Arial, sans-serif !default; {% endhighlight %} diff --git a/docs/content/typography.md b/docs/content/typography.md index 139a7e00e..a59f50347 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -31,27 +31,27 @@ All HTML headings, `<h1>` through `<h6>`, are available. <tbody> <tr> <td><h1>h1. Bootstrap heading</h1></td> - <td class="type-info">Semibold 36px</td> + <td class="type-info">Semibold 2.5rem (40px)</td> </tr> <tr> <td><h2>h2. Bootstrap heading</h2></td> - <td class="type-info">Semibold 30px</td> + <td class="type-info">Semibold 2rem (32px)</td> </tr> <tr> <td><h3>h3. Bootstrap heading</h3></td> - <td class="type-info">Semibold 24px</td> + <td class="type-info">Semibold 1.75rem (28px)</td> </tr> <tr> <td><h4>h4. Bootstrap heading</h4></td> - <td class="type-info">Semibold 18px</td> + <td class="type-info">Semibold 1.5rem (24px)</td> </tr> <tr> <td><h5>h5. Bootstrap heading</h5></td> - <td class="type-info">Semibold 14px</td> + <td class="type-info">Semibold 1.25rem (20px)</td> </tr> <tr> <td><h6>h6. Bootstrap heading</h6></td> - <td class="type-info">Semibold 12px</td> + <td class="type-info">Semibold 1rem (16px)</td> </tr> </tbody> </table> |