From 1adbe2043a0ab6adad95e823397f6444730dfb83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Oct 2013 14:32:23 -0500 Subject: Fixes #10959: round the .lead values down to nearest pixel via floor() --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 1e4ff9d18..55e5e1d77 100644 --- a/less/type.less +++ b/less/type.less @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: @line-height-computed; - font-size: (@font-size-base * 1.15); + font-size: floor(@font-size-base * 1.15); font-weight: 200; line-height: 1.4; -- cgit v1.2.3 From 8098f4e5ba36814030304867092aa268aaf370f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 12 Oct 2013 23:28:50 +0200 Subject: Add more functionality to .small --- less/type.less | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 55e5e1d77..e5544ab3e 100644 --- a/less/type.less +++ b/less/type.less @@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6, line-height: @headings-line-height; color: @headings-color; - small { + small, + .small { font-weight: normal; line-height: 1; color: @headings-small-color; @@ -95,7 +96,8 @@ h3 { margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 65%; } } @@ -105,7 +107,8 @@ h6 { margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); - small { + small, + .small { font-size: 75%; } } @@ -240,10 +243,12 @@ blockquote { border-right: 5px solid @blockquote-border-color; border-left: 0; p, - small { + small, + .small { text-align: right; } - small { + small, + .small { &:before { content: ''; } -- cgit v1.2.3 From a58c83a317f9fa741fe2f6df213616d5538b5c9b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Oct 2013 19:56:44 -0700 Subject: add missing space before open curly brace --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index e5544ab3e..58dd545c1 100644 --- a/less/type.less +++ b/less/type.less @@ -141,7 +141,7 @@ ol { margin-top: 0; margin-bottom: (@line-height-computed / 2); ul, - ol{ + ol { margin-bottom: 0; } } -- cgit v1.2.3 From 4cfe307abeee4f0193a0bcbc54aad08d1115b002 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 26 Oct 2013 14:13:34 +0100 Subject: Fixes #11206: remove left padding on first inline list item --- less/type.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 58dd545c1..c01a6fe0c 100644 --- a/less/type.less +++ b/less/type.less @@ -153,13 +153,19 @@ ol { padding-left: 0; list-style: none; } + // Inline turns list items into inline-block .list-inline { .list-unstyled(); + > li { display: inline-block; padding-left: 5px; padding-right: 5px; + + &:first-child { + padding-left: 0; + } } } -- cgit v1.2.3 From 8a881c78a10892102d3b303e9fc19b23f9039a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 29 Oct 2013 20:06:45 +0100 Subject: Change tense to imperative Matches this comment with the commit messages and other 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 c01a6fe0c..437c70b76 100644 --- a/less/type.less +++ b/less/type.less @@ -210,7 +210,7 @@ dd { // Abbreviations and acronyms abbr[title], -// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 +// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257 abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @abbr-border-color; @@ -238,7 +238,7 @@ blockquote { line-height: @line-height-base; color: @blockquote-small-color; &:before { - content: '\2014 \00A0';// EM DASH, NBSP + content: '\2014 \00A0'; // EM DASH, NBSP } } @@ -259,7 +259,7 @@ blockquote { content: ''; } &:after { - content: '\00A0 \2014';// NBSP, EM DASH + content: '\00A0 \2014'; // NBSP, EM DASH } } } -- cgit v1.2.3 From 0da3901ed5a6d498af8b7c76b61d004a003f716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 8 Nov 2013 10:30:15 +0100 Subject: Add missing `.small` styles and docs --- 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 437c70b76..982d94f59 100644 --- a/less/type.less +++ b/less/type.less @@ -233,7 +233,8 @@ blockquote { p:last-child { margin-bottom: 0; } - small { + small, + .small { display: block; line-height: @line-height-base; color: @blockquote-small-color; -- cgit v1.2.3 From d2f8b5327b36b9a9839d595070d841146aa4c6ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 14:58:35 -0800 Subject: Fixes #11515: Reorder the headings with body text and text emphasis classes --- less/type.less | 100 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 982d94f59..9a359685d 100644 --- a/less/type.less +++ b/less/type.less @@ -3,12 +3,62 @@ // -------------------------------------------------- +// Headings +// ------------------------- + +h1, h2, h3, h4, h5, h6, +.h1, .h2, .h3, .h4, .h5, .h6 { + font-family: @headings-font-family; + font-weight: @headings-font-weight; + line-height: @headings-line-height; + color: @headings-color; + + small, + .small { + font-weight: normal; + line-height: 1; + color: @headings-small-color; + } +} + +h1, +h2, +h3 { + margin-top: @line-height-computed; + margin-bottom: (@line-height-computed / 2); + + small, + .small { + font-size: 65%; + } +} +h4, +h5, +h6 { + margin-top: (@line-height-computed / 2); + margin-bottom: (@line-height-computed / 2); + + small, + .small { + font-size: 75%; + } +} + +h1, .h1 { font-size: @font-size-h1; } +h2, .h2 { font-size: @font-size-h2; } +h3, .h3 { font-size: @font-size-h3; } +h4, .h4 { font-size: @font-size-h4; } +h5, .h5 { font-size: @font-size-h5; } +h6, .h6 { font-size: @font-size-h6; } + + // Body text // ------------------------- p { margin: 0 0 (@line-height-computed / 2); } + .lead { margin-bottom: @line-height-computed; font-size: floor(@font-size-base * 1.15); @@ -72,55 +122,6 @@ cite { font-style: normal; } .text-center { text-align: center; } -// Headings -// ------------------------- - -h1, h2, h3, h4, h5, h6, -.h1, .h2, .h3, .h4, .h5, .h6 { - font-family: @headings-font-family; - font-weight: @headings-font-weight; - line-height: @headings-line-height; - color: @headings-color; - - small, - .small { - font-weight: normal; - line-height: 1; - color: @headings-small-color; - } -} - -h1, -h2, -h3 { - margin-top: @line-height-computed; - margin-bottom: (@line-height-computed / 2); - - small, - .small { - font-size: 65%; - } -} -h4, -h5, -h6 { - margin-top: (@line-height-computed / 2); - margin-bottom: (@line-height-computed / 2); - - small, - .small { - font-size: 75%; - } -} - -h1, .h1 { font-size: @font-size-h1; } -h2, .h2 { font-size: @font-size-h2; } -h3, .h3 { font-size: @font-size-h3; } -h4, .h4 { font-size: @font-size-h4; } -h5, .h5 { font-size: @font-size-h5; } -h6, .h6 { font-size: @font-size-h6; } - - // Page header // ------------------------- @@ -131,7 +132,6 @@ h6, .h6 { font-size: @font-size-h6; } } - // Lists // -------------------------------------------------- -- cgit v1.2.3 From 67d4e3323d322ec7c6719204ca02732576c7ee7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:18:07 -0800 Subject: Fixes #11277: Drop the abbr element from the .initialism selector --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 9a359685d..fdf982fce 100644 --- a/less/type.less +++ b/less/type.less @@ -215,7 +215,7 @@ abbr[data-original-title] { cursor: help; border-bottom: 1px dotted @abbr-border-color; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } -- cgit v1.2.3 From 841da88f3fc93740cca07b6e4581a333d77964f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 23:08:41 -0800 Subject: Remove browser default top margin from dl elements --- 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 fdf982fce..ac07ac7ce 100644 --- a/less/type.less +++ b/less/type.less @@ -171,6 +171,7 @@ ol { // Description Lists dl { + margin-top: 0; // Remove browser default margin-bottom: @line-height-computed; } dt, -- cgit v1.2.3 From 3a65b2c11f43154907923535b56ea84fb84cfb78 Mon Sep 17 00:00:00 2001 From: Haley Date: Mon, 2 Dec 2013 13:29:54 -0600 Subject: Added text-justify class to type.less --- 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 ac07ac7ce..0c9600d50 100644 --- a/less/type.less +++ b/less/type.less @@ -120,6 +120,7 @@ cite { font-style: normal; } .text-left { text-align: left; } .text-right { text-align: right; } .text-center { text-align: center; } +.text-justify { text-align: justify; } // Page header -- cgit v1.2.3 From 0016c17f9307bc71fc96d8d4680a9c861f137cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 23:18:28 -0800 Subject: Switch to `&:extend(.clearfix all)` for clearfix mixin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original discussion: https://github.com/less/less.js/issues/1437#issuecomment-21383639. Since we’re switching to `grunt-contrib-less`, we can take advantage of newer LESS features than what RECESS supported. Included in that is the ability to `:extend`, and not only that, but `:extend(.mixin-name all)`. By doing so, we remove duplicate CSS for all our elements that were being clearfix-ed. Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686, #9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652. (dem issues, tho) --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 0c9600d50..1eddb3f9b 100644 --- a/less/type.less +++ b/less/type.less @@ -202,7 +202,7 @@ dd { } dd { margin-left: @component-offset-horizontal; - .clearfix(); // Clear the floated `dt` if an empty `dd` is present + &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present } } } -- cgit v1.2.3 From 10e74a94e6cb512f9c2d592aaf46252d95e7d498 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 9 Dec 2013 15:35:13 -0800 Subject: improve compliance with LESS's strictMath --- less/type.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/type.less') diff --git a/less/type.less b/less/type.less index 1eddb3f9b..24a581fe8 100644 --- a/less/type.less +++ b/less/type.less @@ -61,7 +61,7 @@ p { .lead { margin-bottom: @line-height-computed; - font-size: floor(@font-size-base * 1.15); + font-size: floor((@font-size-base * 1.15)); font-weight: 200; line-height: 1.4; -- cgit v1.2.3