diff options
| author | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /css.html | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
| download | bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -45,7 +45,7 @@ base_url: "../" <p>Bootstrap sets basic global display, typography, and link styles. Specifically, we:</p> <ul> <li>Remove <code>margin</code> on the body</li> - <li>Set <code>background-color: white;</code> on the <code>body</code></li> + <li>Set <code>background-color: #fff;</code> on the <code>body</code></li> <li>Use the <code>@font-family-base</code>, <code>@font-size-base</code>, and <code>@line-height-base</code> attributes as our typographic base</li> <li>Set the global link color via <code>@link-color</code> and apply link underlines only on <code>:hover</code></li> </ul> |