diff --git a/docs/content/reboot.md b/docs/content/reboot.md index e896d50269..a9dd6a6d0a 100644 --- a/docs/content/reboot.md +++ b/docs/content/reboot.md @@ -53,27 +53,52 @@ This `font-family` is applied to the `` and automatically inherited global All heading elements—e.g., `

`—and `

` are reset to have their `margin-top` removed. Headings have `margin-bottom: .5rem` added and paragraphs `margin-bottom: 1rem` for easy spacing. -

-{% markdown %} -# h1 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. - -## h2 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. - -### h3 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. - -#### h4 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. - -##### h5 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. - -###### h6 heading -Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. -{% endmarkdown %} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
HeadingExample
+ {% markdown %}`

`{% endmarkdown %} +
h1. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h2. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h3. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h4. Bootstrap heading
+ {% markdown %}`
`{% endmarkdown %} +
h5. Bootstrap heading
+ {% markdown %}`
`{% endmarkdown %} +
h6. Bootstrap heading
## Lists diff --git a/docs/content/typography.md b/docs/content/typography.md index 249e1392e5..754b0ac1b2 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -22,36 +22,52 @@ These styles can be found within `_reboot.scss`, and the global variables are de All HTML headings, `

` through `

`, are available. -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -

h1. Bootstrap heading

Semibold 2.5rem (40px)

h2. Bootstrap heading

Semibold 2rem (32px)

h3. Bootstrap heading

Semibold 1.75rem (28px)

h4. Bootstrap heading

Semibold 1.5rem (24px)
h5. Bootstrap heading
Semibold 1.25rem (20px)
h6. Bootstrap heading
Semibold 1rem (16px)
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
HeadingExample
+ {% markdown %}`

`{% endmarkdown %} +
h1. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h2. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h3. Bootstrap heading
+ {% markdown %}`

`{% endmarkdown %} +
h4. Bootstrap heading
+ {% markdown %}`
`{% endmarkdown %} +
h5. Bootstrap heading
+ {% markdown %}`
`{% endmarkdown %} +
h6. Bootstrap heading
{% highlight html %}

h1. Bootstrap heading

@@ -77,12 +93,19 @@ All HTML headings, `

` through `

`, are available. Use the included utility classes to recreate the small secondary heading text from Bootstrap 3. -{% example html %} +
+ + Fancy display heading + With faded secondary text + +
+ +{% highlight html %}

Fancy display heading With faded secondary text

-{% endexample %} +{% endhighlight %} ## Display headings @@ -92,16 +115,16 @@ Traditional heading elements are designed to work best in the meat of your page - + - + - + - +

Display 1

Display 1

Display 2

Display 2

Display 3

Display 3

Display 4

Display 4