diff options
| author | Nicolas Gallagher <[email protected]> | 2012-01-20 21:16:40 +0000 |
|---|---|---|
| committer | Nicolas Gallagher <[email protected]> | 2012-01-20 21:21:59 +0000 |
| commit | 782c994060a984c10d73fdd3cc8e3fe33a2e4477 (patch) | |
| tree | 335492965ee4307054e956cf3aa97a2072422b48 /lib/type.less | |
| parent | 8825443d6e6ff28a97e092f46b42ec508e58cb05 (diff) | |
| download | bootstrap-782c994060a984c10d73fdd3cc8e3fe33a2e4477.tar.xz bootstrap-782c994060a984c10d73fdd3cc8e3fe33a2e4477.zip | |
Remove global reset in favour of contextual reset.
Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.
This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
Diffstat (limited to 'lib/type.less')
| -rw-r--r-- | lib/type.less | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/lib/type.less b/lib/type.less index 707d2215d..e2049fb71 100644 --- a/lib/type.less +++ b/lib/type.less @@ -7,7 +7,7 @@ // --------- p { - margin-bottom: @baseLineHeight / 2; + margin: 0 0 @baseLineHeight / 2; font-family: @baseFontFamily; font-size: @baseFontSize; line-height: @baseLineHeight; @@ -17,15 +17,16 @@ p { } } - // HEADINGS // -------- h1, h2, h3, h4, h5, h6 { + margin: 0; font-weight: bold; color: @grayDark; text-rendering: optimizelegibility; // Fix the character spacing for headings small { + font-weight: normal; color: @grayLight; } } @@ -74,6 +75,7 @@ h6 { // Unordered and Ordered lists ul, ol { + padding: 0; margin: 0 0 @baseLineHeight / 2 25px; } ul ul, @@ -124,13 +126,10 @@ hr { // Emphasis strong { - font-style: inherit; font-weight: bold; } em { font-style: italic; - font-weight: inherit; - line-height: inherit; } .muted { color: @grayLight; @@ -146,8 +145,8 @@ abbr { // Blockquotes blockquote { - padding-left: 15px; - margin-bottom: @baseLineHeight; + padding: 0 0 0 15px; + margin: 0 0 @baseLineHeight; border-left: 5px solid #eee; p { margin-bottom: 0; @@ -176,11 +175,19 @@ blockquote { } } +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} + // Addresses address { display: block; margin-bottom: @baseLineHeight; line-height: @baseLineHeight; + font-style: normal; } // Inline and block code styles @@ -220,4 +227,12 @@ pre { padding: 0; background-color: transparent; } -}
\ No newline at end of file +} + +small { + font-size: 100%; +} + +cite { + font-style: normal; +} |
