From 38941881e9a04c2de61be86fd05e5840c93dd1fb Mon Sep 17 00:00:00 2001 From: Steven Black Date: Fri, 4 Oct 2013 21:43:31 -0400 Subject: Jumbotron: remove the hard-coded font-size from jumbotron.less and moved it into variables.less where other .font-size-xxxxx things now live. --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 1a998b946..e611c3a02 100644 --- a/less/variables.less +++ b/less/variables.less @@ -368,8 +368,8 @@ @jumbotron-padding: 30px; @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; - @jumbotron-heading-color: inherit; +@font-size-jumbotron: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From 0740d01b4ccbce54b9e852df63bdf891b532baa2 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sat, 5 Oct 2013 20:48:28 -0400 Subject: Good catch by @juthilo - omitted the modified in a prior commit. --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index e611c3a02..aede11bac 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@font-size-jumbotron: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.50); // Form states and alerts -- cgit v1.2.3 From e7379f75bdeba88868dd4d4f169122a932e73822 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 20:04:28 -0700 Subject: no trailing decimal place --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index aede11bac..9b55f13b6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -369,7 +369,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@jumbotron-font-size: ceil(@font-size-base * 1.50); +@jumbotron-font-size: ceil(@font-size-base * 1.5); // Form states and alerts -- cgit v1.2.3 From b3c04c95d3d378f8473e76169e40e044895ec849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 14 Oct 2013 15:06:58 +0200 Subject: Nuke trailing zeros --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 9b55f13b6..e596215d0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,9 +48,9 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px @font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px @font-size-h4: ceil(@font-size-base * 1.25); // ~18px @font-size-h5: @font-size-base; @font-size-h6: ceil(@font-size-base * 0.85); // ~12px -- cgit v1.2.3 From 4386650e60efea3fe8ecaab0e0e14b303eea4cac Mon Sep 17 00:00:00 2001 From: Mario Bonito Date: Sat, 9 Nov 2013 13:03:21 -0500 Subject: Corrected color contrast to WCAG 2.0 AA --- less/variables.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index e596215d0..6f2551e2c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -375,19 +375,19 @@ // Form states and alerts // ------------------------- -@state-success-text: #468847; +@state-success-text: #3c763d; @state-success-bg: #dff0d8; @state-success-border: darken(spin(@state-success-bg, -10), 5%); -@state-info-text: #3a87ad; +@state-info-text: #31708f; @state-info-bg: #d9edf7; @state-info-border: darken(spin(@state-info-bg, -10), 7%); -@state-warning-text: #c09853; +@state-warning-text: #8a6d3b; @state-warning-bg: #fcf8e3; @state-warning-border: darken(spin(@state-warning-bg, -10), 5%); -@state-danger-text: #b94a48; +@state-danger-text: #a94442; @state-danger-bg: #f2dede; @state-danger-border: darken(spin(@state-danger-bg, -10), 5%); -- cgit v1.2.3 From ae4d5f21a96fab3691ca33e9e3747a01c467e10e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 16 Nov 2013 18:01:59 -0800 Subject: fixes #11449: use menlo over monaco --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index e596215d0..08bb701db 100644 --- a/less/variables.less +++ b/less/variables.less @@ -41,7 +41,7 @@ @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-serif: Georgia, "Times New Roman", Times, serif; -@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace; +@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-base: @font-family-sans-serif; @font-size-base: 14px; -- cgit v1.2.3 From ea782486082251c5e28e974f5843b6c37147cf51 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Thu, 28 Nov 2013 17:41:43 +0100 Subject: removed all caret border color settings. --- less/variables.less | 3 --- 1 file changed, 3 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 08bb701db..cf217b366 100644 --- a/less/variables.less +++ b/less/variables.less @@ -186,8 +186,6 @@ @dropdown-header-color: @gray-light; -@dropdown-caret-color: #000; - // COMPONENT VARIABLES // -------------------------------------------------- @@ -321,7 +319,6 @@ @nav-disabled-link-hover-color: @gray-light; @nav-open-link-hover-color: #fff; -@nav-open-caret-border-color: #fff; // Tabs @nav-tabs-border-color: #ddd; -- cgit v1.2.3 From 36b82c37ecbedd13f9a2f3eca545745eb8eedf75 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 21:59:28 -0800 Subject: Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index cf217b366..8f3ffedbc 100644 --- a/less/variables.less +++ b/less/variables.less @@ -157,7 +157,7 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); +@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2); @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); @legend-color: @gray-dark; -- cgit v1.2.3 From 4a45650026a16d372feb1f150899e883d410a35e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 18:03:04 -0800 Subject: fix .btn-group-xs portion of #10979 --- less/variables.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 120a65e06..1775be080 100644 --- a/less/variables.less +++ b/less/variables.less @@ -84,6 +84,9 @@ @padding-small-vertical: 5px; @padding-small-horizontal: 10px; +@padding-xs-vertical: 1px; +@padding-xs-horizontal: 5px; + @line-height-large: 1.33; @line-height-small: 1.5; -- cgit v1.2.3 From 45930acdf7b7d03842011b1d20779f1762e99c30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Dec 2013 22:32:56 -0800 Subject: Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization. Also addresses #10371, #10395, and #10465. --- less/variables.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 1775be080..8b5f2184d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -247,8 +247,13 @@ @grid-columns: 12; // Padding, to be divided by two and applied to the left and right of all columns @grid-gutter-width: 30px; -// Point at which the navbar stops collapsing + +// Navbar collapse + +// Point at which the navbar becomes uncollapsed @grid-float-breakpoint: @screen-sm-min; +// Point at which the navbar begins collapsing +@grid-float-breakpoint-max: (@grid-float-breakpoint - 1); // Navbar -- cgit v1.2.3 From 78b43d4c99c5b091980a977656a378f6c46c7c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Fri, 6 Dec 2013 22:34:29 +0100 Subject: Darken icon bar to meet WCAG --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 8b5f2184d..5b2e9044f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -286,7 +286,7 @@ // Navbar toggle @navbar-default-toggle-hover-bg: #ddd; -@navbar-default-toggle-icon-bar-bg: #ccc; +@navbar-default-toggle-icon-bar-bg: #888; @navbar-default-toggle-border-color: #ddd; -- cgit v1.2.3 From b1215d1b2ecd6cd3898af19ce43cc647e2ec854a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 12:18:13 -0800 Subject: Fixes #11193: Add kbd element styles to indicate user input via keyboard --- less/variables.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 5b2e9044f..3681e99b5 100644 --- a/less/variables.less +++ b/less/variables.less @@ -602,6 +602,9 @@ @code-color: #c7254e; @code-bg: #f9f2f4; +@kbd-color: #fff; +@kbd-bg: #333; + @pre-bg: #f5f5f5; @pre-color: @gray-dark; @pre-border-color: #ccc; -- cgit v1.2.3 From 1f9bfa89dc219654b5e096bda9233a58c69216fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 02:14:24 -0800 Subject: Fixes #11741: Don't set headings font-family again, just use inherit --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 3681e99b5..fea7bc75a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -58,7 +58,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-base; +@headings-font-family: inherit; @headings-font-weight: 500; @headings-line-height: 1.1; @headings-color: inherit; -- 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/variables.less | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index fea7bc75a..b9b0d4f4e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -45,18 +45,18 @@ @font-family-base: @font-family-sans-serif; @font-size-base: 14px; -@font-size-large: ceil(@font-size-base * 1.25); // ~18px -@font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-size-large: ceil((@font-size-base * 1.25)); // ~18px +@font-size-small: ceil((@font-size-base * 0.85)); // ~12px -@font-size-h1: floor(@font-size-base * 2.6); // ~36px -@font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.7); // ~24px -@font-size-h4: ceil(@font-size-base * 1.25); // ~18px +@font-size-h1: floor((@font-size-base * 2.6)); // ~36px +@font-size-h2: floor((@font-size-base * 2.15)); // ~30px +@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px +@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px @font-size-h5: @font-size-base; -@font-size-h6: ceil(@font-size-base * 0.85); // ~12px +@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px @line-height-base: 1.428571429; // 20/14 -@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px +@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px @headings-font-family: inherit; @headings-font-weight: 500; @@ -263,7 +263,7 @@ @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; @navbar-border-radius: @border-radius-base; -@navbar-padding-horizontal: floor(@grid-gutter-width / 2); +@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-default-color: #777; @@ -374,7 +374,7 @@ @jumbotron-color: inherit; @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; -@jumbotron-font-size: ceil(@font-size-base * 1.5); +@jumbotron-font-size: ceil((@font-size-base * 1.5)); // Form states and alerts -- cgit v1.2.3 From 2547f1e20f94c592b4125de9006cc45b560af51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 11 Dec 2013 14:36:26 +0100 Subject: Use variables for breadcrumb padding --- less/variables.less | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index fea7bc75a..39b1c0a18 100644 --- a/less/variables.less +++ b/less/variables.less @@ -568,10 +568,12 @@ // Breadcrumbs // ------------------------- -@breadcrumb-bg: #f5f5f5; -@breadcrumb-color: #ccc; -@breadcrumb-active-color: @gray-light; -@breadcrumb-separator: "/"; +@breadcrumb-padding-vertical: 8px; +@breadcrumb-padding-horizontal: 15px; +@breadcrumb-bg: #f5f5f5; +@breadcrumb-color: #ccc; +@breadcrumb-active-color: @gray-light; +@breadcrumb-separator: "/"; // Carousel -- cgit v1.2.3 From 4b47c608351d1ac40a4067a163227db29035c47f Mon Sep 17 00:00:00 2001 From: dzwillia Date: Thu, 12 Dec 2013 12:53:59 -0500 Subject: Added @dropdown-caret-color variable back to variables.less (deprecated) --- less/variables.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 8122161fd..3d7cb660c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -189,6 +189,9 @@ @dropdown-header-color: @gray-light; +// Note: Deprecated @dropdown-caret-color as of v3.1.0 +@dropdown-caret-color: #000; + // COMPONENT VARIABLES // -------------------------------------------------- -- cgit v1.2.3 From 914f5e6a1d6faf57988cd26c31200796a4b743a9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 11:44:54 -0800 Subject: Fixes #11867: Add `@panel-body-padding` variable --- less/variables.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 3d7cb660c..15db9538a 100644 --- a/less/variables.less +++ b/less/variables.less @@ -510,8 +510,10 @@ // Panels // ------------------------- @panel-bg: #fff; -@panel-inner-border: #ddd; +@panel-body-padding: 15px; @panel-border-radius: @border-radius-base; + +@panel-inner-border: #ddd; @panel-footer-bg: #f5f5f5; @panel-default-text: @gray-dark; -- cgit v1.2.3