From 0220015edd1c06e0475a346ca5882e3b1758af48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:07:53 -0700 Subject: remove all ie7 conditionals and mixins --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index f1851a074..a60fdf080 100644 --- a/less/code.less +++ b/less/code.less @@ -33,7 +33,7 @@ pre { white-space: pre; white-space: pre-wrap; background-color: #f5f5f5; - border: 1px solid #ccc; // fallback for IE7-8 + border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); .border-radius(4px); -- cgit v1.2.3 From 9872902e4784220f3add1a1af256dfc89cd6e31a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 23:11:54 -0700 Subject: remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions --- less/code.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index a60fdf080..b38601f56 100644 --- a/less/code.less +++ b/less/code.less @@ -10,7 +10,7 @@ pre { #font > #family > .monospace; font-size: @baseFontSize - 2; color: @grayDark; - .border-radius(3px); + border-radius: 3px; } // Inline code @@ -35,7 +35,7 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); - .border-radius(4px); + border-radius: 4px; // Make prettyprint styles more spaced out for readability &.prettyprint { -- cgit v1.2.3 From 3f4076c635aae1d813694bb7f5cf9abb5a48a44b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 23:49:26 -0700 Subject: consolidate border-radius on code --- less/code.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index b38601f56..b26389b3e 100644 --- a/less/code.less +++ b/less/code.less @@ -10,7 +10,7 @@ pre { #font > #family > .monospace; font-size: @baseFontSize - 2; color: @grayDark; - border-radius: 3px; + border-radius: 4px; } // Inline code @@ -35,7 +35,6 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); - border-radius: 4px; // Make prettyprint styles more spaced out for readability &.prettyprint { @@ -55,4 +54,4 @@ pre { .pre-scrollable { max-height: 340px; overflow-y: scroll; -} \ No newline at end of file +} -- cgit v1.2.3 From 7a3d15eb210cc9343875760bfa575a9273244ed3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Nov 2012 14:37:24 -0800 Subject: Part 1 of unCamelCasing variables --- less/code.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index 778a41beb..5a3256dda 100644 --- a/less/code.less +++ b/less/code.less @@ -8,7 +8,7 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @baseFontSize - 2; + font-size: @base-font-size - 2; color: @grayDark; border-radius: 4px; } @@ -25,10 +25,10 @@ code { // Blocks of code pre { display: block; - padding: (@baseLineHeight - 1) / 2; - margin: 0 0 @baseLineHeight / 2; - font-size: @baseFontSize - 1; // 14px to 13px - line-height: @baseLineHeight; + padding: (@base-line-height - 1) / 2; + margin: 0 0 @base-line-height / 2; + font-size: @base-font-size - 1; // 14px to 13px + line-height: @base-line-height; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -40,7 +40,7 @@ pre { // Make prettyprint styles more spaced out for readability &.prettyprint { - margin-bottom: @baseLineHeight; + margin-bottom: @base-line-height; } // Account for some code outputs that place code tags in pre tags -- cgit v1.2.3 From b0e2b5813db753bdfa3ee018ccdd73e78a69457e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Nov 2012 14:45:25 -0800 Subject: more consistent variable naming patterns --- less/code.less | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index 5a3256dda..fb229d684 100644 --- a/less/code.less +++ b/less/code.less @@ -8,7 +8,7 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @base-font-size - 2; + font-size: @font-size-base - 2; color: @grayDark; border-radius: 4px; } @@ -25,10 +25,10 @@ code { // Blocks of code pre { display: block; - padding: (@base-line-height - 1) / 2; - margin: 0 0 @base-line-height / 2; - font-size: @base-font-size - 1; // 14px to 13px - line-height: @base-line-height; + padding: (@line-height-base - 1) / 2; + margin: 0 0 @line-height-base / 2; + font-size: @font-size-base - 1; // 14px to 13px + line-height: @line-height-base; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -36,11 +36,11 @@ pre { background-color: #f5f5f5; border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); - border-radius: @baseBorderRadius; + border-radius: @border-radius-base; // Make prettyprint styles more spaced out for readability &.prettyprint { - margin-bottom: @base-line-height; + margin-bottom: @line-height-base; } // Account for some code outputs that place code tags in pre tags -- cgit v1.2.3 From 85db846b651842444d374f8e54f3f362ca18d08e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 15 Jan 2013 17:55:14 -0800 Subject: mobile-first navs, navbar, grids, and type --- less/code.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index cf884cb83..1adb3efd4 100644 --- a/less/code.less +++ b/less/code.less @@ -16,9 +16,9 @@ pre { // Inline code code { padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; + font-size: 90%; + color: #c7254e; + background-color: #f9f2f4; white-space: nowrap; } -- cgit v1.2.3 From 5054c17ab86948a4885c35165b0802e5e60d1ee6 Mon Sep 17 00:00:00 2001 From: Luke Page Date: Wed, 6 Mar 2013 16:38:20 +0000 Subject: make less files compile with strict maths in 1.4.0 --- less/code.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index 1adb3efd4..c28b42fdd 100644 --- a/less/code.less +++ b/less/code.less @@ -8,7 +8,7 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @font-size-base - 2; + font-size: (@font-size-base - 2); color: @grayDark; border-radius: 4px; } @@ -25,9 +25,9 @@ code { // Blocks of code pre { display: block; - padding: (@line-height-base - 1) / 2; - margin: 0 0 @line-height-base / 2; - font-size: @font-size-base - 1; // 14px to 13px + padding: ((@line-height-base - 1) / 2); + margin: 0 0 (@line-height-base / 2); + font-size: (@font-size-base - 1); // 14px to 13px line-height: @line-height-base; word-break: break-all; word-wrap: break-word; -- cgit v1.2.3 From 4aba489cfdc113682d2f1b18421eb58a229d66da Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 17 Mar 2013 11:34:27 -0700 Subject: Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index c28b42fdd..c55f32fe7 100644 --- a/less/code.less +++ b/less/code.less @@ -7,7 +7,7 @@ code, pre { padding: 0 3px 2px; - #font > #family > .monospace; + font-family: @font-family-monospace; font-size: (@font-size-base - 2); color: @grayDark; border-radius: 4px; -- cgit v1.2.3 From e0d60b1325591a347d9e49e44be6d77401b07749 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Apr 2013 19:35:36 -0700 Subject: Fixes #7617: lowercase and dash gray color vars --- less/code.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index c55f32fe7..d9ddbc3a4 100644 --- a/less/code.less +++ b/less/code.less @@ -9,7 +9,7 @@ pre { padding: 0 3px 2px; font-family: @font-family-monospace; font-size: (@font-size-base - 2); - color: @grayDark; + color: @gray-dark; border-radius: 4px; } -- cgit v1.2.3 From 94cc3335536507124451de1c9ec673f7dfcb5c2a Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 10 May 2013 09:21:27 -0600 Subject: Fix component margin and padding values to use @line-height-computed --- less/code.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/code.less') diff --git a/less/code.less b/less/code.less index d9ddbc3a4..f1bc0a0cd 100644 --- a/less/code.less +++ b/less/code.less @@ -25,8 +25,8 @@ code { // Blocks of code pre { display: block; - padding: ((@line-height-base - 1) / 2); - margin: 0 0 (@line-height-base / 2); + padding: ((@line-height-computed - 1) / 2); + margin: 0 0 (@line-height-computed / 2); font-size: (@font-size-base - 1); // 14px to 13px line-height: @line-height-base; word-break: break-all; @@ -40,7 +40,7 @@ pre { // Make prettyprint styles more spaced out for readability &.prettyprint { - margin-bottom: @line-height-base; + margin-bottom: @line-height-computed; } // Account for some code outputs that place code tags in pre tags -- cgit v1.2.3