diff options
| author | Mark Otto <[email protected]> | 2014-07-14 08:34:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-14 08:34:56 -0700 |
| commit | cdb0f8229eb6b5aa9abd7e58cd52a593c485dcd1 (patch) | |
| tree | 1d2d0c9a185507d460f0387c10231ae28188d93d /docs/components | |
| parent | 8d55c3c0a3b56f68cd6c37977bdc8439a8d5b09a (diff) | |
| download | bootstrap-cdb0f8229eb6b5aa9abd7e58cd52a593c485dcd1.tar.xz bootstrap-cdb0f8229eb6b5aa9abd7e58cd52a593c485dcd1.zip | |
move scaffolding stuff back to layout once more, split off the type docs to typography section
Diffstat (limited to 'docs/components')
| -rw-r--r-- | docs/components/scaffolding.md | 47 | ||||
| -rw-r--r-- | docs/components/typography.md | 11 |
2 files changed, 11 insertions, 47 deletions
diff --git a/docs/components/scaffolding.md b/docs/components/scaffolding.md deleted file mode 100644 index 84a22e618..000000000 --- a/docs/components/scaffolding.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -layout: page -title: Scaffolding ---- - -Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development. - -### HTML5 doctype - -Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects. - -{% highlight html %} -<!DOCTYPE html> -<html lang="en"> - ... -</html> -{% endhighlight %} - -### Mobile first - -With Bootstrap 2, we added optional mobile friendly styles for key aspects of the framework. With Bootstrap 3, we've rewritten the project to be mobile friendly from the start. Instead of adding on optional mobile styles, they're baked right into the core. In fact, **Bootstrap is mobile first**. Mobile first styles can be found throughout the entire library instead of in separate files. - -To ensure proper rendering and touch zooming, **add the viewport meta tag** to your `<head>`. - -{% highlight html %} -<meta name="viewport" content="width=device-width, initial-scale=1"> -{% endhighlight %} - -You can disable zooming capabilities on mobile devices by adding `user-scalable=no` to the viewport meta tag. This disables zooming, meaning users are only able to scroll, and results in your site feeling a bit more like a native application. Overall, we don't recommend this on every site, so use caution! - -{% highlight html %} -<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> -{% endhighlight %} - -### Typography and links - -Bootstrap sets basic global display, typography, and link styles. Specifically, we: - -- Set `background-color: #fff;` on the `<body>` -- Use the `@font-family-base`, `@font-size-base`, and `@line-height-base` attributes as our typographic base -- Set the global link color via `@link-color` and apply link underlines only on `:hover` - -These styles can be found within `scaffolding.less`. - -### Normalize - -For improved cross-browser rendering, we use [Normalize.css](http://necolas.github.io/normalize.css/) to correct small inconsistencies across browsers and devices. diff --git a/docs/components/typography.md b/docs/components/typography.md index 2fb40e38d..d56d8757d 100644 --- a/docs/components/typography.md +++ b/docs/components/typography.md @@ -5,6 +5,17 @@ title: Typography Bootstrap includes simple and easily customized typography across the project. In addition to the standard headings, body text, and lists, utility classes are also included. +## Global settings + +Bootstrap sets basic global display, typography, and link styles. Specifically, we: + +- Set `background-color: #fff;` on the `<body>` +- Use the `@font-family-base`, `@font-size-base`, and `@line-height-base` attributes as our typographic base +- Set the global link color via `@link-color` and apply link underlines only on `:hover` + +These styles can be found within `scaffolding.less`. + + ## Headings All HTML headings, `<h1>` through `<h6>`, are available. `.h1` through `.h6` classes are also available, for when you want to match the font styling of a heading but still want your text to be displayed inline. |