From 9df832b4bb81d80fd02b4fe6cc9ea826b0b0454e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 19 Jun 2012 19:17:42 -0700 Subject: add separate vars for dropdown link hover and active states --- less/variables.less | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index b931d3d2a..ee7350ec2 100644 --- a/less/variables.less +++ b/less/variables.less @@ -104,12 +104,17 @@ // ------------------------- @dropdownBackground: @white; @dropdownBorder: rgba(0,0,0,.2); -@dropdownLinkColor: @grayDark; -@dropdownLinkColorHover: @white; -@dropdownLinkBackgroundHover: @linkColor; @dropdownDividerTop: #e5e5e5; @dropdownDividerBottom: @white; +@dropdownLinkColor: @grayDark; + +@dropdownLinkColorHover: @white; +@dropdownLinkBackgroundHover: @grayLighter; + +@dropdownLinkColorActive: @dropdownLinkColor; +@dropdownLinkBackgroundActive: @linkColor; + // COMPONENT VARIABLES -- cgit v1.2.3 From 160fe7ca597ff0fdaab0bb49494713724468b05b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 20 Jun 2012 23:46:51 -0700 Subject: create vars for responsive grid values, fixed and fluid, and document them in the customizer --- less/variables.less | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index ee7350ec2..25a032781 100644 --- a/less/variables.less +++ b/less/variables.less @@ -198,6 +198,7 @@ // GRID // -------------------------------------------------- + // Default 940px grid // ------------------------- @gridColumns: 12; @@ -205,7 +206,24 @@ @gridGutterWidth: 20px; @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); +// 1200px min +@gridColumnWidth1200: 70px; +@gridGutterWidth1200: 30px; + +// 768px-979px +@gridColumnWidth768: 42px; +@gridGutterWidth768: 20px; + + // Fluid grid // ------------------------- @fluidGridColumnWidth: 6.382978723%; @fluidGridGutterWidth: 2.127659574%; + +// 1200px min +@fluidGridColumnWidth1200: 5.982905983%; +@fluidGridGutterWidth1200: 2.564102564%; + +// 768px-979px +@fluidGridColumnWidth768: 5.801104972%; +@fluidGridGutterWidth768: 2.762430939%; -- cgit v1.2.3 From 71669dda63644a7b4162ca63f8b9c88b3586c7e4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 24 Jun 2012 20:26:48 -0700 Subject: tons of docs cleanup in css, adding subnav to official components --- less/variables.less | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 25a032781..0060e207c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -168,6 +168,16 @@ @navbarBrandColor: @navbarLinkColor; +// Subnav +// ------------------------- +@subnavHeight: 36px; +@subnavBackground: #eeeeee; +@subnavBackgroundHighlight: #f5f5f5; + +@subnavBorder: #e5e5e5; +@subnavBorderRadius: 4px; + + // Hero unit // ------------------------- @heroUnitBackground: @grayLighter; -- cgit v1.2.3 From 87af5d3bbe3546f9b876add2e35ad656accfc3ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 24 Jun 2012 20:42:31 -0700 Subject: more subnav optimizations --- less/variables.less | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 0060e207c..25a032781 100644 --- a/less/variables.less +++ b/less/variables.less @@ -168,16 +168,6 @@ @navbarBrandColor: @navbarLinkColor; -// Subnav -// ------------------------- -@subnavHeight: 36px; -@subnavBackground: #eeeeee; -@subnavBackgroundHighlight: #f5f5f5; - -@subnavBorder: #e5e5e5; -@subnavBorderRadius: 4px; - - // Hero unit // ------------------------- @heroUnitBackground: @grayLighter; -- cgit v1.2.3 From c09e8473e2be483d3f53186840c002167647c44b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 10:03:46 -0700 Subject: use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta --- less/variables.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 25a032781..bd3a2905d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -148,6 +148,11 @@ @hrBorder: @grayLighter; +// Wells +// ------------------------- +@wellBackground: #f5f5f5; + + // Navbar // ------------------------- @navbarHeight: 40px; -- cgit v1.2.3 From cd2d82150cc27c1f81d2394a22efbf2dbec0e7be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Jun 2012 21:46:45 -0700 Subject: standardize top level file comments --- less/variables.less | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index bd3a2905d..09dc55494 100644 --- a/less/variables.less +++ b/less/variables.less @@ -1,10 +1,9 @@ -// Variables.less -// Variables to customize the look and feel of Bootstrap -// ----------------------------------------------------- - +// +// Variables +// -------------------------------------------------- -// GLOBAL VALUES +// Global values // -------------------------------------------------- -- cgit v1.2.3 From 70e81e6f55ad77f3777e87c4edd646a2f5ac8bee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Jul 2012 08:42:09 -0700 Subject: new jumbotron --- 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 09dc55494..dcd2d5558 100644 --- a/less/variables.less +++ b/less/variables.less @@ -87,7 +87,7 @@ @btnDangerBackground: #ee5f5b; @btnDangerBackgroundHighlight: #bd362f; -@btnInverseBackground: @gray; +@btnInverseBackground: #444; @btnInverseBackgroundHighlight: @grayDarker; -- cgit v1.2.3 From 62c386259b7fbd1ef665fc6baf4458c8e05ad1f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 4 Jul 2012 23:31:30 -0700 Subject: rewrite docs homepage, new graphics --- 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 dcd2d5558..5d900164c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -73,7 +73,7 @@ @btnBorder: #ccc; @btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); +@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); @btnInfoBackground: #5bc0de; @btnInfoBackgroundHighlight: #2f96b4; @@ -155,8 +155,8 @@ // Navbar // ------------------------- @navbarHeight: 40px; -@navbarBackground: @grayDarker; -@navbarBackgroundHighlight: @grayDark; +@navbarBackground: #111; +@navbarBackgroundHighlight: #222; @navbarText: @grayLight; @navbarLinkColor: @grayLight; -- cgit v1.2.3 From 3c07eaa251b73e6c5eff4b56e074c54708a4b4ba Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:11:54 -0700 Subject: updates to type scale --- 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 5d900164c..9a3e0ed4e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,9 +48,9 @@ @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; -@baseFontSize: 13px; +@baseFontSize: 14px; @baseFontFamily: @sansFontFamily; -@baseLineHeight: 18px; +@baseLineHeight: 20px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -- cgit v1.2.3 From 68146db00454b46493545aff34d06cf2c11e0f6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 5 Jul 2012 15:15:57 -0700 Subject: buttons and pre updates for font-size --- 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 9a3e0ed4e..bc8ff4bed 100644 --- a/less/variables.less +++ b/less/variables.less @@ -46,7 +46,7 @@ // ------------------------- @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; -@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; +@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; @baseFontSize: 14px; @baseFontFamily: @sansFontFamily; -- cgit v1.2.3 From e2336ef02ab620277e2d81f3fc6b4ff69e027ae4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Jul 2012 00:30:43 -0700 Subject: remove specific values for the fluid grid system and instead use LESS's percentage() function --- less/variables.less | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 09dc55494..4d07f0649 100644 --- a/less/variables.less +++ b/less/variables.less @@ -213,21 +213,23 @@ // 1200px min @gridColumnWidth1200: 70px; @gridGutterWidth1200: 30px; +@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)); // 768px-979px @gridColumnWidth768: 42px; @gridGutterWidth768: 20px; +@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)); // Fluid grid // ------------------------- -@fluidGridColumnWidth: 6.382978723%; -@fluidGridGutterWidth: 2.127659574%; +@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth); +@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth); // 1200px min -@fluidGridColumnWidth1200: 5.982905983%; -@fluidGridGutterWidth1200: 2.564102564%; +@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200); +@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200); // 768px-979px -@fluidGridColumnWidth768: 5.801104972%; -@fluidGridGutterWidth768: 2.762430939%; +@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768); +@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768); -- cgit v1.2.3 From 64e87a85f5e17e3cf603b97e21d58b077060e7b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 22:14:30 -0700 Subject: remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 --- less/variables.less | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 9e7146a75..394d10636 100644 --- a/less/variables.less +++ b/less/variables.less @@ -198,6 +198,20 @@ @infoBorder: darken(spin(@infoBackground, -10), 7%); +// Tooltips and popovers +// ------------------------- +@tooltipArrowWidth: 5px; +@tooltipArrowColor: #000; + +@popoverArrowWidth: 10px; +@popoverArrowColor: #fff; +@popoverTitleBackground: #f5f5f5; + +// Special enhancement for popovers +@popoverArrowOuterWidth: @popoverArrowWidth + 1; +@popoverArrowOuterColor: rgba(0,0,0,.2); + + // GRID // -------------------------------------------------- -- cgit v1.2.3 From a750551feee3a70005327fb1ec9318629c4f1f29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jul 2012 00:36:21 -0700 Subject: add vars for tooltip customization via background and color --- 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 394d10636..725100443 100644 --- a/less/variables.less +++ b/less/variables.less @@ -200,8 +200,10 @@ // Tooltips and popovers // ------------------------- +@tooltipColor: #fff; +@tooltipBackground: #000; @tooltipArrowWidth: 5px; -@tooltipArrowColor: #000; +@tooltipArrowColor: @tooltipBackground; @popoverArrowWidth: 10px; @popoverArrowColor: #fff; -- cgit v1.2.3 From 39f8996d6a34ac2fab1bdf47db65fd9bde891308 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 17 Jul 2012 22:26:53 -0700 Subject: fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding --- 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 725100443..ae5cd5e00 100644 --- a/less/variables.less +++ b/less/variables.less @@ -109,7 +109,7 @@ @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; -@dropdownLinkBackgroundHover: @grayLighter; +@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; @dropdownLinkColorActive: @dropdownLinkColor; @dropdownLinkBackgroundActive: @linkColor; -- cgit v1.2.3 From 6474190746fd163375200119b9d2cc7066e05d43 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 26 Jul 2012 23:42:36 -0700 Subject: increase height of homepage jumbotron, update vars and styles of popovers --- 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 ae5cd5e00..0e3e13f41 100644 --- a/less/variables.less +++ b/less/variables.less @@ -205,13 +205,14 @@ @tooltipArrowWidth: 5px; @tooltipArrowColor: @tooltipBackground; +@popoverBackground: #fff; @popoverArrowWidth: 10px; @popoverArrowColor: #fff; -@popoverTitleBackground: #f5f5f5; +@popoverTitleBackground: darken(@popoverBackground, 3%); // Special enhancement for popovers @popoverArrowOuterWidth: @popoverArrowWidth + 1; -@popoverArrowOuterColor: rgba(0,0,0,.2); +@popoverArrowOuterColor: rgba(0,0,0,.25); -- cgit v1.2.3 From a30045daef809edf5ed592ad842c04377898e444 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jul 2012 00:30:15 -0700 Subject: reverse navbar styles to save code --- less/variables.less | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 0e3e13f41..9c914d874 100644 --- a/less/variables.less +++ b/less/variables.less @@ -155,15 +155,16 @@ // Navbar // ------------------------- @navbarHeight: 40px; -@navbarBackground: #111; -@navbarBackgroundHighlight: #222; - -@navbarText: @grayLight; -@navbarLinkColor: @grayLight; -@navbarLinkColorHover: @white; -@navbarLinkColorActive: @navbarLinkColorHover; +@navbarBackground: darken(@navbarBackgroundHighlight, 5%); +@navbarBackgroundHighlight: #ffffff; +@navbarBorder: darken(@navbarBackground, 12%); + +@navbarText: @gray; +@navbarLinkColor: @gray; +@navbarLinkColorHover: @grayDark; +@navbarLinkColorActive: @gray; @navbarLinkBackgroundHover: transparent; -@navbarLinkBackgroundActive: @navbarBackground; +@navbarLinkBackgroundActive: darken(@navbarBackground, 5%); @navbarSearchBackground: lighten(@navbarBackground, 25%); @navbarSearchBackgroundFocus: @white; @@ -171,6 +172,26 @@ @navbarSearchPlaceholderColor: #ccc; @navbarBrandColor: @navbarLinkColor; +// Inverted navbar +@navbarInverseBackground: #111111; +@navbarInverseBackgroundHighlight: #222222; +@navbarInverseBorder: #252525; + +@navbarInverseText: @grayLight; +@navbarInverseLinkColor: @grayLight; +@navbarInverseLinkColorHover: @white; +@navbarInverseLinkColorActive: @navbarInverseLinkColorHover; +@navbarInverseLinkBackgroundHover: transparent; +@navbarInverseLinkBackgroundActive: @navbarInverseBackground; + +@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); +@navbarInverseSearchBackgroundFocus: @white; +@navbarInverseSearchBorder: @navbarInverseBackground; +@navbarInverseSearchPlaceholderColor: #ccc; + +@navbarInverseBrandColor: @navbarInverseLinkColor; + + // Hero unit // ------------------------- -- cgit v1.2.3 From 04164e4367134103a2ca94e49785a18b17032ec3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 10:24:41 -0700 Subject: fixes #3858: add var for responsive navbar. also add additional examples to navbar docs --- 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 9c914d874..7d627f9ee 100644 --- a/less/variables.less +++ b/less/variables.less @@ -154,6 +154,8 @@ // Navbar // ------------------------- +@navbarCollapseWidth: 979px; + @navbarHeight: 40px; @navbarBackground: darken(@navbarBackgroundHighlight, 5%); @navbarBackgroundHighlight: #ffffff; -- cgit v1.2.3 From b2ebd5c46ca538142c5cd4164328c56053b5c79d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jul 2012 12:52:44 -0700 Subject: update button styles to use updated 14px base font size, align carets to others with no opacity changes --- 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 7d627f9ee..93cd1d639 100644 --- a/less/variables.less +++ b/less/variables.less @@ -70,7 +70,7 @@ // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: #ccc; +@btnBorder: #bbb; @btnPrimaryBackground: @linkColor; @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); -- cgit v1.2.3 From 8ed77c41f0a38556371eae7dbfdd07625bf7fca2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 7 Aug 2012 22:37:38 -0700 Subject: fixes #4295: add vars for pagination --- less/variables.less | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 93cd1d639..d4b44a2de 100644 --- a/less/variables.less +++ b/less/variables.less @@ -194,6 +194,12 @@ @navbarInverseBrandColor: @navbarInverseLinkColor; +// Pagination +// ------------------------- +@paginationBackground: #fff; +@paginationBorder: #ddd; +@paginationActiveBackground: #f5f5f5; + // Hero unit // ------------------------- -- cgit v1.2.3 From 97a23ef2e66919094ecfc517d9b5b9278a64441d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Aug 2012 22:57:40 -0700 Subject: fixes #4342: navbar vars not in use, render navbar dividers --- less/variables.less | 4 ---- 1 file changed, 4 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index d4b44a2de..42b76df45 100644 --- a/less/variables.less +++ b/less/variables.less @@ -168,10 +168,6 @@ @navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundActive: darken(@navbarBackground, 5%); -@navbarSearchBackground: lighten(@navbarBackground, 25%); -@navbarSearchBackgroundFocus: @white; -@navbarSearchBorder: darken(@navbarSearchBackground, 30%); -@navbarSearchPlaceholderColor: #ccc; @navbarBrandColor: @navbarLinkColor; // Inverted navbar -- cgit v1.2.3 From e79eb75e0944c2852fc47e117f4e96b984e40051 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Aug 2012 17:05:37 -0700 Subject: fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within --- 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 42b76df45..a5c8cdd98 100644 --- a/less/variables.less +++ b/less/variables.less @@ -125,7 +125,7 @@ // Try to avoid customizing these :) @zindexDropdown: 1000; @zindexPopover: 1010; -@zindexTooltip: 1020; +@zindexTooltip: 1030; @zindexFixedNavbar: 1030; @zindexModalBackdrop: 1040; @zindexModal: 1050; -- cgit v1.2.3