From 1ff1dfb2bd031832c725c146deb8b7363cfeadf5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 16:07:45 -0700 Subject: fixes #9348 by ditching a comment --- 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 3a9430e2e..012f486b1 100644 --- a/less/variables.less +++ b/less/variables.less @@ -226,7 +226,7 @@ @navbar-color: #777; @navbar-bg: #eee; @navbar-border-radius: @border-radius-base; -@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px +@navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); // Navbar links -- cgit v1.2.3 From 8b76e0d0f0c5679f12935c4a3dad98917636702b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 17:23:19 -0700 Subject: addressing #9189 manually, part 1: code and pre vars --- less/variables.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 012f486b1..991e6587c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -557,7 +557,9 @@ @code-bg: #f9f2f4; @pre-bg: #f5f5f5; +@pre-color: @gray-dark; @pre-border-color: #ccc; +@pre-scrollable-max-height: 340px; // Type // ------------------------ -- cgit v1.2.3 From 58b90dae1570eca6c921933742bf418ebf3ee47b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 17:47:30 -0700 Subject: addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) --- 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 991e6587c..910eebb8d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -163,6 +163,9 @@ @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-disabled-color: @gray-light; + +@dropdown-header-color: @gray-light; @dropdown-caret-color: #000; -- cgit v1.2.3 From 286636755a42887a24ec48c8c2db57b32f0df000 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 17:47:53 -0700 Subject: spacing --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 910eebb8d..61d67ceed 100644 --- a/less/variables.less +++ b/less/variables.less @@ -166,6 +166,7 @@ @dropdown-link-disabled-color: @gray-light; @dropdown-header-color: @gray-light; + @dropdown-caret-color: #000; -- cgit v1.2.3 From 83f1a75e7a8ae4570641f1fcf88c2062373fff62 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 18:06:26 -0700 Subject: addressing #9189 manually, part 3: forms --- less/variables.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 61d67ceed..bbe58ede0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -133,6 +133,7 @@ @input-bg: #fff; @input-bg-disabled: @gray-lighter; +@input-color: @gray; @input-border: #ccc; @input-border-radius: @border-radius-base; @input-border-focus: #66afe9; @@ -143,6 +144,7 @@ @input-height-large: (floor(@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; @legend-border-color: #e5e5e5; @input-group-addon-border-color: @input-border; -- cgit v1.2.3 From a66cdb0c304b701c299bdbf24a53dd6105d4429d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 18:09:56 -0700 Subject: addressing #9189 manually, part 4: input group background var --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index bbe58ede0..89e01700e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -147,6 +147,7 @@ @legend-color: @gray-dark; @legend-border-color: #e5e5e5; +@input-group-addon-bg: @gray-lighter; @input-group-addon-border-color: @input-border; -- cgit v1.2.3 From c2cfd3153bd181ebd05b347d04b3fff08fa1d890 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 18:32:52 -0700 Subject: addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 89e01700e..bf180aff6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -232,6 +232,7 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; +@navbar-margin-bottom: @line-height-computed; @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); -- cgit v1.2.3 From 0819cfc4503ffc2084f9358b9c896b50c0ddf864 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 19:32:16 -0700 Subject: addressing #9189 manually, part 7: thumbnails vars --- less/variables.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index bf180aff6..f2a622fbe 100644 --- a/less/variables.less +++ b/less/variables.less @@ -499,11 +499,14 @@ // Thumbnails // ------------------------- -@thumbnail-caption-color: @text-color; +@thumbnail-padding: 4px; @thumbnail-bg: @body-bg; @thumbnail-border: #ddd; @thumbnail-border-radius: @border-radius-base; +@thumbnail-caption-color: @text-color; +@thumbnail-caption-padding: 9px; + // Wells // ------------------------- -- cgit v1.2.3 From a2b9988eb908e5b95fb253aac7fde0fbd61c375e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 00:28:50 -0700 Subject: Media query (grid and responsive utilities) overhaul Grid classes have been changed to account for a fourth set of classes, meaning we now have XS, S, M, and L options. Specifically, we made the following changes: * Renames `.col-` to `.col-xs-` * Adds `.col-md-` for devices 992px wide and up * Remaps `.col-lg-` for devices 1200px wide and up Alongside that, we've updated our media queries to better handle advanced grid layouts: * All column classes now kick in when they hit a `min-width`, undoing the #9128 fix in https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb c690f3a65 * All column offsets, pushes, and pulls are scoped to an appropriate range, meaning a `min-width` and `max-width` (thanks for the idea, @eratzlaff) We've also modified the widths of our grid containers for the small device grid (now a max 720px instead of 728px) and large device grid (now a max 1140px instead of 1170px) to avoid horizontal scrollbar problems in Firefox (likely due to box-sizing, which is why we didn't see it in 2.x). Similarly, we've updated the responsive ultility classes to match the new four media query approach of the grid system. That means we've: * Added new `.visible-xs` and `.hidden-xs` classes * Reassigns visible and hidden classes for small, medium, and large to matching grid system media queries * Updates docs examples to match grid system and account for fourth utility range ----- Fixes the following: * #9135: fourth grid tier * #9302: undoes previous range change for small grid system, so no need to update any docs here * #8755: consistent grid and responsive utilities schemas) * #9195, #9216, and #9227: no more horizontal scrollbars --- less/variables.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index f2a622fbe..4bdf54905 100644 --- a/less/variables.less +++ b/less/variables.less @@ -209,6 +209,7 @@ @screen-large-desktop: @screen-large; // So media queries don't overlap when required, provide a maximum +@screen-phone-max: (@screen-small - 1); @screen-small-max: (@screen-medium - 1); @screen-tablet-max: (@screen-desktop - 1); @screen-desktop-max: (@screen-large-desktop - 1); @@ -595,10 +596,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: 728px; +@container-tablet: 720px; // Medium screen / desktop @container-desktop: 940px; // Large screen / wide desktop -@container-large-desktop: 1170px; +@container-large-desktop: 1140px; -- cgit v1.2.3 From 3c772b1cebfed73570247691917b40fcf3d95aa2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 13 Aug 2013 13:39:21 -0700 Subject: lighter default navbar, add borders to navbars, tweak padding and alignments --- less/variables.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 4bdf54905..089f4fb19 100644 --- a/less/variables.less +++ b/less/variables.less @@ -231,9 +231,10 @@ // Basics of a navbar @navbar-height: 50px; -@navbar-color: #777; -@navbar-bg: #eee; @navbar-margin-bottom: @line-height-computed; +@navbar-color: #777; +@navbar-bg: #f8f8f8; +@navbar-border: darken(@navbar-bg, 6.5%); @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @@ -243,7 +244,7 @@ @navbar-link-hover-color: #333; @navbar-link-hover-bg: transparent; @navbar-link-active-color: #555; -@navbar-link-active-bg: darken(@navbar-bg, 10%); +@navbar-link-active-bg: darken(@navbar-bg, 6.5%); @navbar-link-disabled-color: #ccc; @navbar-link-disabled-bg: transparent; @@ -263,6 +264,7 @@ // Reset inverted navbar basics @navbar-inverse-color: @gray-light; @navbar-inverse-bg: #222; +@navbar-inverse-border: darken(@navbar-inverse-bg, 10%); // Inverted navbar links @navbar-inverse-link-color: @gray-light; -- cgit v1.2.3 From 09464b5d4183183524373c0a1c08cc69a5883918 Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Wed, 14 Aug 2013 16:33:35 +0200 Subject: Remove old accordion remnant --- less/variables.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 089f4fb19..b85aaecf1 100644 --- a/less/variables.less +++ b/less/variables.less @@ -516,11 +516,6 @@ @well-bg: #f5f5f5; -// Accordion -// ------------------------- -@accordion-border-color: #e5e5e5; - - // Badges // ------------------------- @badge-color: #fff; -- cgit v1.2.3 From 209d3af30188a6b426f0cf84d81b367b2f056e1b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 11:31:26 -0700 Subject: Fixes #9617: consistent variation order, add .label-primary --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index b85aaecf1..a76ffc96b 100644 --- a/less/variables.less +++ b/less/variables.less @@ -396,6 +396,7 @@ // ------------------------- @label-default-bg: @gray-light; +@label-primary-bg: @brand-primary; @label-success-bg: @brand-success; @label-info-bg: @brand-info; @label-warning-bg: @brand-warning; -- cgit v1.2.3 From f9d2f9b6cd805c39217dcef0a11d4b721dc8e045 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:16:06 -0700 Subject: improve pagination's active state so it looks less like the active state and more like active nav items --- less/variables.less | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index a76ffc96b..79415c637 100644 --- a/less/variables.less +++ b/less/variables.less @@ -326,10 +326,15 @@ @pagination-bg: #fff; @pagination-border: #ddd; -@pagination-active-bg: #f5f5f5; -@pagination-active-color: @gray-light; + +@pagination-hover-bg: @gray-lighter; + +@pagination-active-bg: @brand-primary; +@pagination-active-color: #fff; + @pagination-disabled-color: @gray-light; + // Pager // ------------------------- -- cgit v1.2.3 From bf1772130855ba0423fabe8fdce8015a3f7f739c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 13:58:16 -0700 Subject: fixes #9587: add var for nav link padding --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 79415c637..aa0f9fb0c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -296,6 +296,7 @@ // Navs // ------------------------- +@nav-link-padding: 10px 15px; @nav-link-hover-bg: @gray-lighter; @nav-disabled-link-color: @gray-light; -- cgit v1.2.3 From cd0df1d21aaed8751b8c29aab3b30ff027aac89d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 16 Aug 2013 22:37:02 -0700 Subject: fixes #9436 more: put padding on containers, not the body because full width elements --- less/variables.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index aa0f9fb0c..ddfeae727 100644 --- a/less/variables.less +++ b/less/variables.less @@ -600,10 +600,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: 720px; +@container-tablet: 750px; // 720px + 30px left/right padding // Medium screen / desktop -@container-desktop: 940px; +@container-desktop: 970px; // 940px + 30px left/right padding // Large screen / wide desktop -@container-large-desktop: 1140px; +@container-large-desktop: 1170px; // 1140px + 30px left/right padding -- cgit v1.2.3 From e12d6208b6912aefe7ead384e460006988ebdbec Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 17 Aug 2013 00:02:17 -0700 Subject: un-hardcode @grid-gutter-width in @container-* LESS vars --- less/variables.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index ddfeae727..c3eeaaebc 100644 --- a/less/variables.less +++ b/less/variables.less @@ -600,10 +600,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: 750px; // 720px + 30px left/right padding +@container-tablet: ((720px + @grid-gutter-width)); // Medium screen / desktop -@container-desktop: 970px; // 940px + 30px left/right padding +@container-desktop: ((940px + @grid-gutter-width)); // Large screen / wide desktop -@container-large-desktop: 1170px; // 1140px + 30px left/right padding +@container-large-desktop: ((1140px + @grid-gutter-width)); -- cgit v1.2.3 From 61caed21e2553e1be29d98bd83c8e6ac06565ecd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 15:21:38 -0700 Subject: More consistent naming with screen size variables using xs, sm, md, and lg --- less/variables.less | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index c3eeaaebc..a46ad4fb6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -193,26 +193,25 @@ // -------------------------------------------------- // Extra small screen / phone -@screen-xsmall: 480px; -@screen-phone: @screen-xsmall; +@screen-xs: 480px; +@screen-phone: @screen-xs; // Small screen / tablet -@screen-small: 768px; -@screen-tablet: @screen-small; +@screen-sm: 768px; +@screen-tablet: @screen-sm; // Medium screen / desktop -@screen-medium: 992px; -@screen-desktop: @screen-medium; +@screen-md: 992px; +@screen-desktop: @screen-md; // Large screen / wide desktop -@screen-large: 1200px; -@screen-large-desktop: @screen-large; +@screen-lg: 1200px; +@screen-lg-desktop: @screen-lg; // So media queries don't overlap when required, provide a maximum -@screen-phone-max: (@screen-small - 1); -@screen-small-max: (@screen-medium - 1); -@screen-tablet-max: (@screen-desktop - 1); -@screen-desktop-max: (@screen-large-desktop - 1); +@screen-xs-max: (@screen-sm - 1); +@screen-sm-max: (@screen-md - 1); +@screen-md-max: (@screen-lg - 1); // Grid system @@ -600,10 +599,10 @@ // -------------------------------------------------- // Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); +@container-tablet: ((720px + @grid-gutter-width)); // Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); +@container-desktop: ((940px + @grid-gutter-width)); // Large screen / wide desktop -@container-large-desktop: ((1140px + @grid-gutter-width)); +@container-lg-desktop: ((1140px + @grid-gutter-width)); -- cgit v1.2.3