From f919f6f94f3e8405d7653a5f16f8b3d587c47f4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:40:27 -0700 Subject: huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins --- lib/type.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 077ae9d8f..88b320459 100644 --- a/lib/type.less +++ b/lib/type.less @@ -41,15 +41,16 @@ h2 { font-size: 14px; } } -h3, h4, h5, h6 { - line-height: @baseline * 2; -} h3 { + line-height: @baseline * 2; font-size: 18px; small { font-size: 14px; } } +h4, h5, h6 { + line-height: @baseline; +} h4 { font-size: 16px; small { -- cgit v1.2.3 From 00204a80cf1c45cb9d7d80986756401d304a3944 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 29 Sep 2011 01:44:51 -0700 Subject: change h4 back to lineheight * 2 --- lib/type.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 88b320459..ea1f289e7 100644 --- a/lib/type.less +++ b/lib/type.less @@ -48,20 +48,20 @@ h3 { font-size: 14px; } } -h4, h5, h6 { - line-height: @baseline; -} h4 { font-size: 16px; + line-height: @baseline * 2; small { font-size: 12px; } } h5 { font-size: 14px; + line-height: @baseline; } h6 { font-size: 13px; + line-height: @baseline; color: @grayLight; text-transform: uppercase; } -- cgit v1.2.3 From 96dd7a2903aa5213ddb364b385660e26396dc670 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Oct 2011 00:20:38 -0700 Subject: update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement --- lib/type.less | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index ea1f289e7..4232a24df 100644 --- a/lib/type.less +++ b/lib/type.less @@ -7,10 +7,12 @@ // --------- p { - #font > .shorthand(normal,@basefont,@baseline); - margin-bottom: @baseline / 2; + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; + margin-bottom: @baseLineHeight / 2; small { - font-size: @basefont - 2; + font-size: @baseFontSize - 2; color: @grayLight; } } @@ -27,22 +29,22 @@ h1, h2, h3, h4, h5, h6 { } } h1 { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; font-size: 30px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 18px; } } h2 { font-size: 24px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 14px; } } h3 { - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; font-size: 18px; small { font-size: 14px; @@ -50,18 +52,18 @@ h3 { } h4 { font-size: 16px; - line-height: @baseline * 2; + line-height: @baseLineHeight * 2; small { font-size: 12px; } } h5 { font-size: 14px; - line-height: @baseline; + line-height: @baseLineHeight; } h6 { font-size: 13px; - line-height: @baseline; + line-height: @baseLineHeight; color: @grayLight; text-transform: uppercase; } @@ -72,7 +74,7 @@ h6 { // Unordered and Ordered lists ul, ol { - margin: 0 0 @baseline 25px; + margin: 0 0 @baseLineHeight 25px; } ul ul, ul ol, @@ -87,7 +89,7 @@ ol { list-style: decimal; } li { - line-height: @baseline; + line-height: @baseLineHeight; color: @gray; } ul.unstyled { @@ -97,15 +99,15 @@ ul.unstyled { // Description Lists dl { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; dt, dd { - line-height: @baseline; + line-height: @baseLineHeight; } dt { font-weight: bold; } dd { - margin-left: @baseline / 2; + margin-left: @baseLineHeight / 2; } } @@ -135,16 +137,16 @@ em { // Blockquotes blockquote { - margin-bottom: @baseline; + margin-bottom: @baseLineHeight; border-left: 5px solid #eee; padding-left: 15px; p { - #font > .shorthand(300,14px,@baseline); + #font > .shorthand(300,14px,@baseLineHeight); margin-bottom: 0; } small { display: block; - #font > .shorthand(300,12px,@baseline); + #font > .shorthand(300,12px,@baseLineHeight); color: @grayLight; &:before { content: '\2014 \00A0'; @@ -155,14 +157,14 @@ blockquote { // Addresses address { display: block; - line-height: @baseline; - margin-bottom: @baseline; + line-height: @baseLineHeight; + margin-bottom: @baseLineHeight; } // Inline and block code styles code, pre { padding: 0 3px 2px; - font-family: Monaco, Andale Mono, Courier New, monospace; + font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; font-size: 12px; .border-radius(3px); } @@ -174,9 +176,9 @@ code { pre { background-color: #f5f5f5; display: block; - padding: (@baseline - 1) / 2; - margin: 0 0 @baseline; - line-height: @baseline; + padding: (@baseLineHeight - 1) / 2; + margin: 0 0 @baseLineHeight; + line-height: @baseLineHeight; font-size: 12px; border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); -- cgit v1.2.3 From 6f44a90edbfc897082dd69630983391bf6e57ba7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 11:35:24 -0700 Subject: tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles --- lib/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 4232a24df..7cf9e6ccd 100644 --- a/lib/type.less +++ b/lib/type.less @@ -38,13 +38,13 @@ h1 { } h2 { font-size: 24px; - line-height: @baseLineHeight * 2; + line-height: @baseLineHeight * 1.5; small { font-size: 14px; } } h3 { - line-height: @baseLineHeight * 2; + line-height: @baseLineHeight * 1.5; font-size: 18px; small { font-size: 14px; -- cgit v1.2.3 From 2a82b38cff142ec86a6e1dc4f9366205260d262d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 16 Oct 2011 18:01:05 -0700 Subject: tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks --- lib/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 7cf9e6ccd..c746a58af 100644 --- a/lib/type.less +++ b/lib/type.less @@ -38,7 +38,7 @@ h1 { } h2 { font-size: 24px; - line-height: @baseLineHeight * 1.5; + line-height: @baseLineHeight * 2; small { font-size: 14px; } @@ -90,7 +90,7 @@ ol { } li { line-height: @baseLineHeight; - color: @gray; + color: @grayDark; } ul.unstyled { list-style: none; -- cgit v1.2.3 From f48baceeda7dc18e1fdf78f89c55b3de40a3357e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 12:45:09 -0700 Subject: remove bottom margin from h1 --- lib/type.less | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index c746a58af..28d893fb9 100644 --- a/lib/type.less +++ b/lib/type.less @@ -29,7 +29,6 @@ h1, h2, h3, h4, h5, h6 { } } h1 { - margin-bottom: @baseLineHeight; font-size: 30px; line-height: @baseLineHeight * 2; small { -- cgit v1.2.3 From 27cbe7f63a13fad987dc2547ef5b6f526ceb268c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 14:17:29 -0700 Subject: add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content --- lib/type.less | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 28d893fb9..4978dd786 100644 --- a/lib/type.less +++ b/lib/type.less @@ -24,6 +24,7 @@ p { h1, h2, h3, h4, h5, h6 { font-weight: bold; color: @grayDark; + text-rendering: optimizelegibility; small { color: @grayLight; } @@ -39,7 +40,7 @@ h2 { font-size: 24px; line-height: @baseLineHeight * 2; small { - font-size: 14px; + font-size: 18px; } } h3 { @@ -134,6 +135,14 @@ em { color: @grayLight; } +// Abbreviations and acronyms +abbr { + font-size: 90%; + text-transform: uppercase; + border-bottom: 1px dotted #ddd; + cursor: help; +} + // Blockquotes blockquote { margin-bottom: @baseLineHeight; -- cgit v1.2.3 From 369b9720c6090985c678076eebb59c080c0ed27c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Oct 2011 23:45:35 -0700 Subject: adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 4978dd786..a490bf5fa 100644 --- a/lib/type.less +++ b/lib/type.less @@ -74,7 +74,7 @@ h6 { // Unordered and Ordered lists ul, ol { - margin: 0 0 @baseLineHeight 25px; + margin: 0 0 @baseLineHeight / 2 25px; } ul ul, ul ol, -- cgit v1.2.3 From b4c0d2a6b2fe1bc92c3635cda71b63ee08a05be4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Oct 2011 22:49:37 -0700 Subject: tweaks to the responsive layout to improve type --- lib/type.less | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index a490bf5fa..d092b203d 100644 --- a/lib/type.less +++ b/lib/type.less @@ -24,7 +24,7 @@ p { h1, h2, h3, h4, h5, h6 { font-weight: bold; color: @grayDark; - text-rendering: optimizelegibility; + text-rendering: optimizelegibility; // Fix the character spacing for headings small { color: @grayLight; } @@ -185,7 +185,7 @@ pre { background-color: #f5f5f5; display: block; padding: (@baseLineHeight - 1) / 2; - margin: 0 0 @baseLineHeight; + margin: 0 0 @baseLineHeight / 2; line-height: @baseLineHeight; font-size: 12px; border: 1px solid #ccc; @@ -193,6 +193,5 @@ pre { .border-radius(3px); white-space: pre; white-space: pre-wrap; - word-wrap: break-word; - + word-break: break-all; } \ No newline at end of file -- cgit v1.2.3 From e616026d678239104b93cafca9a77ea74a4c0ddf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 21:04:14 -0700 Subject: update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies --- lib/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index d092b203d..7f8044cd8 100644 --- a/lib/type.less +++ b/lib/type.less @@ -149,12 +149,12 @@ blockquote { border-left: 5px solid #eee; padding-left: 15px; p { - #font > .shorthand(300,14px,@baseLineHeight); + #font > .shorthand(300,16px,@baseLineHeight * 1.25); margin-bottom: 0; } small { display: block; - #font > .shorthand(300,12px,@baseLineHeight); + line-height: @baseLineHeight; color: @grayLight; &:before { content: '\2014 \00A0'; -- cgit v1.2.3 From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: updated docs and type styles for blockquotes and a few fixes for type --- lib/type.less | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 7f8044cd8..421d666a4 100644 --- a/lib/type.less +++ b/lib/type.less @@ -160,6 +160,15 @@ blockquote { content: '\2014 \00A0'; } } + + // Float right with text-align: right + &.pull-right { + float: right; + p, + small { + text-align: right; + } + } } // Addresses -- cgit v1.2.3 From 159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 00:52:11 -0800 Subject: remove code styling if it's in a pre tag --- lib/type.less | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 421d666a4..f5b5ff272 100644 --- a/lib/type.less +++ b/lib/type.less @@ -179,15 +179,16 @@ address { } // Inline and block code styles -code, pre { +code, +pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, Andale Mono, Courier New, monospace; + #font > #family > .monospace; font-size: 12px; + color: @grayDark; .border-radius(3px); } code { background-color: lighten(@orange, 40%); - color: rgba(0,0,0,.75); padding: 1px 3px; } pre { @@ -203,4 +204,10 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + + // Account for some code outputs that place code tags in pre tags + code { + padding: 0; + background-color: transparent; + } } \ No newline at end of file -- cgit v1.2.3 From 4e6275d0fe0880d32633a2c139dad8d3e2745bb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 17 Nov 2011 01:28:42 -0800 Subject: update property order and do some misc cleanup --- lib/type.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index f5b5ff272..8e25fd9c5 100644 --- a/lib/type.less +++ b/lib/type.less @@ -7,10 +7,10 @@ // --------- p { + margin-bottom: @baseLineHeight / 2; font-family: @baseFontFamily; font-size: @baseFontSize; line-height: @baseLineHeight; - margin-bottom: @baseLineHeight / 2; small { font-size: @baseFontSize - 2; color: @grayLight; @@ -93,8 +93,8 @@ li { color: @grayDark; } ul.unstyled { - list-style: none; margin-left: 0; + list-style: none; } // Description Lists @@ -145,12 +145,12 @@ abbr { // Blockquotes blockquote { + padding-left: 15px; margin-bottom: @baseLineHeight; border-left: 5px solid #eee; - padding-left: 15px; p { - #font > .shorthand(300,16px,@baseLineHeight * 1.25); margin-bottom: 0; + #font > .shorthand(300,16px,@baseLineHeight * 1.25); } small { display: block; @@ -174,8 +174,8 @@ blockquote { // Addresses address { display: block; - line-height: @baseLineHeight; margin-bottom: @baseLineHeight; + line-height: @baseLineHeight; } // Inline and block code styles @@ -188,16 +188,16 @@ pre { .border-radius(3px); } code { - background-color: lighten(@orange, 40%); padding: 1px 3px; + background-color: lighten(@orange, 40%); } pre { - background-color: #f5f5f5; display: block; padding: (@baseLineHeight - 1) / 2; margin: 0 0 @baseLineHeight / 2; - line-height: @baseLineHeight; font-size: 12px; + line-height: @baseLineHeight; + background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); -- cgit v1.2.3 From 3157de8d1d4b69c0f5152b4a784bd185f76c9ac4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 25 Nov 2011 21:34:55 -0800 Subject: clean up comments for better built files --- lib/type.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 8e25fd9c5..407a20ec2 100644 --- a/lib/type.less +++ b/lib/type.less @@ -1,6 +1,6 @@ -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ +// Typography.less +// Headings, body text, lists, code, and more for a versatile and durable typography system +// ---------------------------------------------------------------------------------------- // BODY TEXT -- cgit v1.2.3 From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- lib/type.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 407a20ec2..bdc99acdf 100644 --- a/lib/type.less +++ b/lib/type.less @@ -205,6 +205,11 @@ pre { white-space: pre-wrap; word-break: break-all; + // Make prettyprint styles more spaced out for readability + &.prettyprint { + margin-bottom: @baseLineHeight; + } + // Account for some code outputs that place code tags in pre tags code { padding: 0; -- cgit v1.2.3 From 5c8df1d2858c3d5f2cc65a80acaef5312b1ae87f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Dec 2011 14:34:38 -0800 Subject: updated index page to add featured sites, more docs tweaks --- lib/type.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index bdc99acdf..b2ba73b86 100644 --- a/lib/type.less +++ b/lib/type.less @@ -116,9 +116,10 @@ dl { // Horizontal rules hr { - margin: 20px 0 19px; + margin: @baseLineHeight * 1.5 0; border: 0; - border-bottom: 1px solid #eee; + border-top: 1px solid #e5e5e5; + border-bottom: 1px solid #fff; } // Emphasis -- cgit v1.2.3 From fb9401b355366452d310d39f51224999da4daa82 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 01:34:14 -0800 Subject: tweaks abound, updated prettify styles, new sidenav component started, sprite icons started --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index b2ba73b86..cc446a69d 100644 --- a/lib/type.less +++ b/lib/type.less @@ -74,7 +74,7 @@ h6 { // Unordered and Ordered lists ul, ol { - margin: 0 0 @baseLineHeight / 2 25px; + margin: 13px 0 14px 25px; } ul ul, ul ol, -- cgit v1.2.3 From 621dd13d87b6ba5fd351966056ea335c6a946f45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jan 2012 15:43:07 -0800 Subject: move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body --- lib/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index cc446a69d..59dae717f 100644 --- a/lib/type.less +++ b/lib/type.less @@ -74,7 +74,7 @@ h6 { // Unordered and Ordered lists ul, ol { - margin: 13px 0 14px 25px; + margin: 0 0 @baseLineHeight / 2 25px; } ul ul, ul ol, @@ -90,7 +90,7 @@ ol { } li { line-height: @baseLineHeight; - color: @grayDark; + color: @gray; } ul.unstyled { margin-left: 0; -- cgit v1.2.3 From cfc2353059df628c67d19a3c5c3ead2cc6051f53 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 6 Jan 2012 23:59:22 -0800 Subject: front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates --- lib/type.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 59dae717f..4aa642358 100644 --- a/lib/type.less +++ b/lib/type.less @@ -50,20 +50,20 @@ h3 { font-size: 14px; } } +h4, h5, h6 { + line-height: @baseLineHeight; +} h4 { - font-size: 16px; - line-height: @baseLineHeight * 2; + font-size: 14px; small { font-size: 12px; } } h5 { - font-size: 14px; - line-height: @baseLineHeight; + font-size: 12px; } h6 { - font-size: 13px; - line-height: @baseLineHeight; + font-size: 11px; color: @grayLight; text-transform: uppercase; } -- cgit v1.2.3 From 8ccc3bcf03fedbe8c3a19a96c08a5cad6ae456e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 03:45:24 -0800 Subject: overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 4aa642358..32cb09431 100644 --- a/lib/type.less +++ b/lib/type.less @@ -116,7 +116,7 @@ dl { // Horizontal rules hr { - margin: @baseLineHeight * 1.5 0; + margin: @baseLineHeight 0; border: 0; border-top: 1px solid #e5e5e5; border-bottom: 1px solid #fff; -- cgit v1.2.3 From 2948d1c3b247a5aff1fd1f15cf72540e3f492f57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jan 2012 20:40:28 -0800 Subject: overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 32cb09431..7e2c4a7a8 100644 --- a/lib/type.less +++ b/lib/type.less @@ -201,7 +201,7 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); - .border-radius(3px); + .border-radius(4px); white-space: pre; white-space: pre-wrap; word-break: break-all; -- cgit v1.2.3 From 916761d56854ca4fcc8ea4afa68511fb26a93e4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jan 2012 01:57:05 -0800 Subject: fix styles on right aligned blockquote to flip padding and border appropriately --- lib/type.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 7e2c4a7a8..84130f3fa 100644 --- a/lib/type.less +++ b/lib/type.less @@ -165,6 +165,10 @@ blockquote { // Float right with text-align: right &.pull-right { float: right; + padding-left: 0; + padding-right: 15px; + border-left: 0; + border-right: 5px solid #eee; p, small { text-align: right; -- cgit v1.2.3 From 5e3c21133430112bf8361827dc7a6a29f3f56c72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jan 2012 10:19:07 -0800 Subject: fix type shorthand in blockquote --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 84130f3fa..73462b38a 100644 --- a/lib/type.less +++ b/lib/type.less @@ -151,7 +151,7 @@ blockquote { border-left: 5px solid #eee; p { margin-bottom: 0; - #font > .shorthand(300,16px,@baseLineHeight * 1.25); + #font > .shorthand(16px,300,@baseLineHeight * 1.25); } small { display: block; -- cgit v1.2.3 From ef8b27cdc7ad490b4b52003a7178bd1465ee5dc9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 12 Jan 2012 12:30:36 -0800 Subject: fix heading --- lib/type.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 73462b38a..f7d5077cf 100644 --- a/lib/type.less +++ b/lib/type.less @@ -69,8 +69,8 @@ h6 { } -// COLORS -// ------ +// LISTS +// ----- // Unordered and Ordered lists ul, ol { -- cgit v1.2.3 From f587e81b7d72e47b16bf808c721c3dfe45ae1062 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Jan 2012 16:18:15 -0800 Subject: rewrite alert messages to use less code, combine the look of default and block messages, simplify docs --- lib/type.less | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index f7d5077cf..ab7409ce3 100644 --- a/lib/type.less +++ b/lib/type.less @@ -90,7 +90,6 @@ ol { } li { line-height: @baseLineHeight; - color: @gray; } ul.unstyled { margin-left: 0; -- cgit v1.2.3 From 127c0d0b52c52227dcd3f346d371e5cd4219a08f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 13:12:29 -0800 Subject: make dl and child elements less specific --- lib/type.less | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index ab7409ce3..707d2215d 100644 --- a/lib/type.less +++ b/lib/type.less @@ -99,15 +99,16 @@ ul.unstyled { // Description Lists dl { margin-bottom: @baseLineHeight; - dt, dd { - line-height: @baseLineHeight; - } - dt { - font-weight: bold; - } - dd { - margin-left: @baseLineHeight / 2; - } +} +dt, +dd { + line-height: @baseLineHeight; +} +dt { + font-weight: bold; +} +dd { + margin-left: @baseLineHeight / 2; } // MISC -- cgit v1.2.3 From 782c994060a984c10d73fdd3cc8e3fe33a2e4477 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Fri, 20 Jan 2012 21:16:40 +0000 Subject: 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. --- lib/type.less | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) (limited to 'lib/type.less') 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; +} -- cgit v1.2.3 From e0238bfb08b67c089c1c609e9e68e5252e0ba992 Mon Sep 17 00:00:00 2001 From: Jon Stevens Date: Sat, 21 Jan 2012 15:24:06 -0800 Subject: clean up variable usage with colors --- lib/type.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 707d2215d..a94a4956e 100644 --- a/lib/type.less +++ b/lib/type.less @@ -119,7 +119,7 @@ hr { margin: @baseLineHeight 0; border: 0; border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #fff; + border-bottom: 1px solid @white; } // Emphasis @@ -148,7 +148,7 @@ abbr { blockquote { padding-left: 15px; margin-bottom: @baseLineHeight; - border-left: 5px solid #eee; + border-left: 5px solid @grayLighter; p { margin-bottom: 0; #font > .shorthand(16px,300,@baseLineHeight * 1.25); @@ -168,7 +168,7 @@ blockquote { padding-left: 0; padding-right: 15px; border-left: 0; - border-right: 5px solid #eee; + border-right: 5px solid @grayLighter; p, small { text-align: right; -- cgit v1.2.3 From 8ff621aa26dee69088b527089cdd719bce68be31 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 16:07:30 -0800 Subject: fix broken index page heading, update variables and less pages --- lib/type.less | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 2c6e7db6a..d828ab6c9 100644 --- a/lib/type.less +++ b/lib/type.less @@ -175,6 +175,7 @@ blockquote { } } +// Quotes q:before, q:after, blockquote:before, @@ -195,13 +196,16 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: 12px; + font-size: @baseFontSize - 2; color: @grayDark; .border-radius(3px); } code { - padding: 1px 3px; + padding: 3px 4px; background-color: lighten(@orange, 40%); + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; } pre { display: block; @@ -210,7 +214,7 @@ pre { font-size: 12px; line-height: @baseLineHeight; background-color: #f5f5f5; - border: 1px solid #ccc; + border: 1px solid #ccc; // fallback for IE7-8 border: 1px solid rgba(0,0,0,.15); .border-radius(4px); white-space: pre; -- cgit v1.2.3 From c2312220e4e1da3939c9fa79e97d79f693058ea2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 16:19:01 -0800 Subject: fix code type size --- lib/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index d828ab6c9..211111761 100644 --- a/lib/type.less +++ b/lib/type.less @@ -196,7 +196,7 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @baseFontSize - 2; + font-size: @baseFontSize - 1; color: @grayDark; .border-radius(3px); } -- cgit v1.2.3 From 6ab56051fdf916f03efb8aa6675e50bdd1cc3155 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2012 23:35:34 -0800 Subject: fix up docs css for responsive and subnav, fix forms error states --- lib/type.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 211111761..548c222f1 100644 --- a/lib/type.less +++ b/lib/type.less @@ -16,6 +16,12 @@ p { color: @grayLight; } } +.lead { + margin-bottom: @baseLineHeight; + font-size: 20px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; +} // HEADINGS // -------- @@ -202,7 +208,6 @@ pre { } code { padding: 3px 4px; - background-color: lighten(@orange, 40%); color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; -- cgit v1.2.3 From f82db4b95bf12bc6c04a5ecc3d4a649ba9800db0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jan 2012 14:53:35 -0800 Subject: separate code from type css files --- lib/type.less | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less index 548c222f1..087224fd0 100644 --- a/lib/type.less +++ b/lib/type.less @@ -197,51 +197,10 @@ address { font-style: normal; } -// Inline and block code styles -code, -pre { - padding: 0 3px 2px; - #font > #family > .monospace; - font-size: @baseFontSize - 1; - color: @grayDark; - .border-radius(3px); -} -code { - padding: 3px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: (@baseLineHeight - 1) / 2; - margin: 0 0 @baseLineHeight / 2; - font-size: 12px; - line-height: @baseLineHeight; - background-color: #f5f5f5; - border: 1px solid #ccc; // fallback for IE7-8 - border: 1px solid rgba(0,0,0,.15); - .border-radius(4px); - white-space: pre; - white-space: pre-wrap; - word-break: break-all; - - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: @baseLineHeight; - } - - // Account for some code outputs that place code tags in pre tags - code { - padding: 0; - background-color: transparent; - } -} - +// Misc small { font-size: 100%; } - cite { font-style: normal; } -- cgit v1.2.3 From dc2deb9a1b1995bbabee91bfd579d9b466fe78f2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 21:48:46 -0800 Subject: moving structure around + more work on builder... --- lib/type.less | 206 ---------------------------------------------------------- 1 file changed, 206 deletions(-) delete mode 100644 lib/type.less (limited to 'lib/type.less') diff --git a/lib/type.less b/lib/type.less deleted file mode 100644 index 087224fd0..000000000 --- a/lib/type.less +++ /dev/null @@ -1,206 +0,0 @@ -// Typography.less -// Headings, body text, lists, code, and more for a versatile and durable typography system -// ---------------------------------------------------------------------------------------- - - -// BODY TEXT -// --------- - -p { - margin: 0 0 @baseLineHeight / 2; - font-family: @baseFontFamily; - font-size: @baseFontSize; - line-height: @baseLineHeight; - small { - font-size: @baseFontSize - 2; - color: @grayLight; - } -} -.lead { - margin-bottom: @baseLineHeight; - font-size: 20px; - font-weight: 200; - line-height: @baseLineHeight * 1.5; -} - -// 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; - } -} -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 { - line-height: @baseLineHeight * 1.5; - font-size: 18px; - 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; -} - - -// LISTS -// ----- - -// Unordered and Ordered lists -ul, ol { - padding: 0; - margin: 0 0 @baseLineHeight / 2 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: @baseLineHeight; -} -ul.unstyled { - margin-left: 0; - list-style: none; -} - -// Description Lists -dl { - margin-bottom: @baseLineHeight; -} -dt, -dd { - line-height: @baseLineHeight; -} -dt { - font-weight: bold; -} -dd { - margin-left: @baseLineHeight / 2; -} - -// MISC -// ---- - -// Horizontal rules -hr { - margin: @baseLineHeight 0; - border: 0; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid @white; -} - -// Emphasis -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: @grayLight; -} - -// Abbreviations and acronyms -abbr { - font-size: 90%; - text-transform: uppercase; - border-bottom: 1px dotted #ddd; - cursor: help; -} - -// Blockquotes -blockquote { - padding: 0 0 0 15px; - margin: 0 0 @baseLineHeight; - border-left: 5px solid @grayLighter; - p { - margin-bottom: 0; - #font > .shorthand(16px,300,@baseLineHeight * 1.25); - } - small { - display: block; - line-height: @baseLineHeight; - color: @grayLight; - &:before { - content: '\2014 \00A0'; - } - } - - // Float right with text-align: right - &.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid @grayLighter; - p, - small { - text-align: right; - } - } -} - -// Quotes -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -// Addresses -address { - display: block; - margin-bottom: @baseLineHeight; - line-height: @baseLineHeight; - font-style: normal; -} - -// Misc -small { - font-size: 100%; -} -cite { - font-style: normal; -} -- cgit v1.2.3