From 78849cf52ef2eba9dd8df621985ac277b67dd23b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jun 2012 15:09:39 -0700 Subject: remove jank fix for dt bold text --- less/type.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index bdf8e605e..41514b56c 100644 --- a/less/type.less +++ b/less/type.less @@ -124,7 +124,6 @@ dd { } dt { font-weight: bold; - line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug } dd { margin-left: @baseLineHeight / 2; -- cgit v1.2.3 From cd2d82150cc27c1f81d2394a22efbf2dbec0e7be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 21:46:45 -0700 Subject: standardize top level file comments --- less/type.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 41514b56c..61a7db493 100644 --- a/less/type.less +++ b/less/type.less @@ -1,6 +1,6 @@ -// Typography.less -// Headings, body text, lists, code, and more for a versatile and durable typography system -// ---------------------------------------------------------------------------------------- +// +// Typography +// -------------------------------------------------- // BODY TEXT -- cgit v1.2.3 From 3c07eaa251b73e6c5eff4b56e074c54708a4b4ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:11:54 -0700 Subject: updates to type scale --- less/type.less | 74 +++++++++++++++++++--------------------------------------- 1 file changed, 24 insertions(+), 50 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 61a7db493..8ff42476a 100644 --- a/less/type.less +++ b/less/type.less @@ -3,8 +3,8 @@ // -------------------------------------------------- -// BODY TEXT -// --------- +// Body text +// ------------------------- p { margin: 0 0 @baseLineHeight / 2; @@ -20,13 +20,15 @@ p { line-height: @baseLineHeight * 1.5; } -// HEADINGS -// -------- + +// Headings +// ------------------------- h1, h2, h3, h4, h5, h6 { - margin: 0; + margin: (@baseLineHeight / 2) 0; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; + line-height: 1; color: @headingsColor; text-rendering: optimizelegibility; // Fix the character spacing for headings small { @@ -34,59 +36,31 @@ h1, h2, h3, h4, h5, h6 { color: @grayLight; } } -h1 { - font-size: 30px; - line-height: @baseLineHeight * 2; - small { - font-size: 18px; - } -} -h2 { - font-size: 24px; - line-height: @baseLineHeight * 2; - small { - font-size: 18px; - } -} -h3 { - font-size: 18px; - line-height: @baseLineHeight * 1.5; - small { - font-size: 14px; - } -} -h4, h5, h6 { - line-height: @baseLineHeight; -} -h4 { - font-size: 14px; - small { - font-size: 12px; - } -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: @grayLight; - text-transform: uppercase; -} +h1 { font-size: 36px; line-height: 40px; } +h2 { font-size: 30px; line-height: 40px; } +h3 { font-size: 24px; line-height: 40px; } +h4 { font-size: 18px; line-height: 20px; } +h5 { font-size: 14px; line-height: 20px; } +h6 { font-size: 12px; line-height: 20px; } + +h1 small { font-size: 24px; } +h2 small { font-size: 18px; } +h3 small { font-size: 14px; } +h4 small { font-size: 14px; } + // Page header +// ------------------------- + .page-header { - padding-bottom: @baseLineHeight - 1; - margin: @baseLineHeight 0; + margin: @baseLineHeight 0 (@baseLineHeight - 1); border-bottom: 1px solid @grayLighter; } -.page-header h1 { - line-height: 1; -} -// LISTS -// ----- +// Lists +// -------------------------------------------------- // Unordered and Ordered lists ul, ol { -- cgit v1.2.3 From 19ea4668e5d62303b26e322d32b45d6268837c18 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jul 2012 10:35:08 -0700 Subject: prevent small tags from increasing height of headings --- less/type.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 61a7db493..a424f0f5c 100644 --- a/less/type.less +++ b/less/type.less @@ -31,6 +31,7 @@ h1, h2, h3, h4, h5, h6 { text-rendering: optimizelegibility; // Fix the character spacing for headings small { font-weight: normal; + line-height: 1; color: @grayLight; } } -- cgit v1.2.3 From 20676ddd4d3e46c9fb32aadfeddb3a4a68efa6a3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jul 2012 01:47:36 -0700 Subject: adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar --- less/type.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index e3106c717..697b64a54 100644 --- a/less/type.less +++ b/less/type.less @@ -54,7 +54,8 @@ h4 small { font-size: 14px; } // ------------------------- .page-header { - margin: @baseLineHeight 0 (@baseLineHeight - 1); + padding-bottom: (@baseLineHeight / 2) - 1; + margin: @baseLineHeight 0 (@baseLineHeight * 1.5); border-bottom: 1px solid @grayLighter; } -- cgit v1.2.3 From e20d2dfe9d1f43e164d8fdbef64f4041df70b762 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jul 2012 16:13:25 -0700 Subject: docs cleanup and blockquote cleanup for .pull-right option --- less/type.less | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 697b64a54..5cb93af0f 100644 --- a/less/type.less +++ b/less/type.less @@ -179,6 +179,14 @@ blockquote { small { text-align: right; } + small { + &:before { + content: ''; + } + &:after { + content: '\00A0 \2014'; + } + } } } -- cgit v1.2.3 From 478396fd4eaacd505104f44f97e0470409ce433a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 19:11:41 -0700 Subject: remove list-type declarations from ul and ol elements since those should just use browser defaults --- less/type.less | 6 ------ 1 file changed, 6 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 5cb93af0f..b1e323033 100644 --- a/less/type.less +++ b/less/type.less @@ -75,12 +75,6 @@ ol ol, ol ul { margin-bottom: 0; } -ul { - list-style: disc; -} -ol { - list-style: decimal; -} li { line-height: @baseLineHeight; } -- cgit v1.2.3 From 887f11d47f052a0dd123f76a6ac39a955c2429d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Aug 2012 13:12:19 -0700 Subject: fixes #4455: improve small styles and add to docs --- less/type.less | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index b1e323033..58723f788 100644 --- a/less/type.less +++ b/less/type.less @@ -8,10 +8,6 @@ p { margin: 0 0 @baseLineHeight / 2; - small { - font-size: @baseFontSize - 2; - color: @grayLight; - } } .lead { margin-bottom: @baseLineHeight; @@ -21,6 +17,26 @@ p { } +// Emphasis & misc +// ------------------------- + +small { + font-size: 85%; // Ex: 14px base font * 85% = about 12px +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} +.muted { + color: @grayLight; +} + + // Headings // ------------------------- @@ -123,17 +139,6 @@ hr { border-bottom: 1px solid @white; } -// Emphasis -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: @grayLight; -} - // Abbreviations and acronyms abbr[title] { cursor: help; @@ -199,11 +204,3 @@ address { font-style: normal; line-height: @baseLineHeight; } - -// Misc -small { - font-size: 100%; -} -cite { - font-style: normal; -} -- cgit v1.2.3