From 1ea09b751eca711a65f881a58ba67c71ee6b47e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Sep 2012 08:52:19 -0700 Subject: fixes #5163: add new var for navbar collapse's default view, use that in responsive navbar css --- 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 7d6efe005..734664316 100644 --- a/less/variables.less +++ b/less/variables.less @@ -157,6 +157,7 @@ // Navbar // ------------------------- @navbarCollapseWidth: 979px; +@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; @navbarHeight: 40px; @navbarBackgroundHighlight: #ffffff; -- cgit v1.2.3 From 2769241aeb5e9eba4a34ddbd9d495f7f8271e360 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Sep 2012 20:56:20 -0700 Subject: add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other --- 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 734664316..5fb685377 100644 --- a/less/variables.less +++ b/less/variables.less @@ -57,6 +57,7 @@ @headingsFontWeight: bold; // instead of browser default, bold @headingsColor: inherit; // empty to use BS default, @textColor + // Tables // ------------------------- @tableBackground: transparent; // overall background-color @@ -97,6 +98,7 @@ @inputDisabledBackground: @grayLighter; @formActionsBackground: #f5f5f5; + // Dropdowns // ------------------------- @dropdownBackground: @white; @@ -116,6 +118,7 @@ // COMPONENT VARIABLES // -------------------------------------------------- + // Z-index master list // ------------------------- // Used for a bird's eye view of components dependent on the z-axis @@ -128,6 +131,17 @@ @zindexModal: 1050; +// Component size variations +// ------------------------- +@fontSizeLarge: @baseFontSize * 1.25; // ~18px +@fontSizeSmall: @baseFontSize * 0.85; // ~12px +@fontSizeMini: @baseFontSize * 0.75; // ~11px + +@paddingLarge: 10px 19px; +@paddingSmall: 6px 10px; +@paddingMini: 5px 6px; + + // Sprite icons path // ------------------------- @iconSpritePath: "../img/glyphicons-halflings.png"; -- cgit v1.2.3 From 2d90c816accea106cbf70c988ddd866268851595 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 18 Sep 2012 21:16:08 -0700 Subject: add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations --- less/variables.less | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 5fb685377..fcb85c009 100644 --- a/less/variables.less +++ b/less/variables.less @@ -58,6 +58,23 @@ @headingsColor: inherit; // empty to use BS default, @textColor +// Component sizing +// ------------------------- +// Based on 14px font-size and 20px line-height + +@fontSizeLarge: @baseFontSize * 1.25; // ~18px +@fontSizeSmall: @baseFontSize * 0.85; // ~12px +@fontSizeMini: @baseFontSize * 0.75; // ~11px + +@paddingLarge: 11px 19px; // 44px +@paddingSmall: 2px 10px; // 26px +@paddingMini: 1px 6px; // 24px + +@baseBorderRadius: 4px; +@borderRadiusLarge: 5px; +@borderRadiusSmall: 3px; + + // Tables // ------------------------- @tableBackground: transparent; // overall background-color @@ -94,7 +111,7 @@ // ------------------------- @inputBackground: @white; @inputBorder: #ccc; -@inputBorderRadius: 3px; +@inputBorderRadius: @baseBorderRadius; @inputDisabledBackground: @grayLighter; @formActionsBackground: #f5f5f5; @@ -131,17 +148,6 @@ @zindexModal: 1050; -// Component size variations -// ------------------------- -@fontSizeLarge: @baseFontSize * 1.25; // ~18px -@fontSizeSmall: @baseFontSize * 0.85; // ~12px -@fontSizeMini: @baseFontSize * 0.75; // ~11px - -@paddingLarge: 10px 19px; -@paddingSmall: 6px 10px; -@paddingMini: 5px 6px; - - // Sprite icons path // ------------------------- @iconSpritePath: "../img/glyphicons-halflings.png"; -- cgit v1.2.3 From c92a75999f8b82c1a6fc997eca1cc0206c4c3bf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Sep 2012 11:45:59 -0700 Subject: fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms --- 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 fcb85c009..7ca1305fe 100644 --- a/less/variables.less +++ b/less/variables.less @@ -114,6 +114,7 @@ @inputBorderRadius: @baseBorderRadius; @inputDisabledBackground: @grayLighter; @formActionsBackground: #f5f5f5; +@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border // Dropdowns -- cgit v1.2.3 From dd8b745b883a900aa637a7b8142be5691ebc3913 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 3 Oct 2012 09:26:52 -0700 Subject: use border-radius vars where possible --- 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 7ca1305fe..3fb5274c3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -71,7 +71,7 @@ @paddingMini: 1px 6px; // 24px @baseBorderRadius: 4px; -@borderRadiusLarge: 5px; +@borderRadiusLarge: 6px; @borderRadiusSmall: 3px; -- cgit v1.2.3