From 1aedb7862ccf93bb983652bc24c11cc9f01699d3 Mon Sep 17 00:00:00 2001 From: syed Date: Sun, 28 Jul 2013 17:32:08 +0500 Subject: move things around Moved alerts, badges, button groups, buttons, carousel, close to variables.less and customize.html --- less/variables.less | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 878725f6c..c97847d7d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,11 +48,13 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px +@font-weight-base: 500; + @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-weight: 500; +@headings-font-weight: @font-weight-base; @headings-line-height: 1.1; @@ -120,6 +122,11 @@ @btn-hover-color: @btn-default-color; +@btn-small-line-height: 1.5; +@btn-link-disabled-color: @gray-dark; +@btn-large-caret-border-width: 5px; + + // Forms // ------------------------- @@ -383,6 +390,8 @@ @alert-info-text: @state-info-text; @alert-info-border: @state-info-border; +@alert-link-font-weight: @font-weight-base; + // Progress bars // ------------------------- @@ -467,6 +476,10 @@ @badge-active-color: @link-color; @badge-active-bg: #fff; +@badge-font-weight: bold; +@badge-line-height: 1; +@badge-border-radius: 10px; + // Breadcrumbs // ------------------------- @@ -480,9 +493,13 @@ @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); @carousel-control-color: #fff; +@carousel-control-width: 15%; +@carousel-control-opacity: .5; +@carousel-control-font-size: 20px; -@carousel-indicator-border-color: #fff; +@carousel-indicators-width: 120px; @carousel-indicator-active-bg: #fff; +@carousel-indicator-border-color: #fff; @carousel-caption-color: #fff; @@ -492,6 +509,9 @@ @close-color: #000; @close-text-shadow: 0 1px 0 #fff; +@close-font-weight: bold; +@close-line-height: 1; + // Code // ------------------------ -- cgit v1.2.3 From 173dac4e54281312ebb7ff993df20caffbc56840 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 15:09:48 -0700 Subject: Tighten up buttons and form controls * Smaller padding on buttons and large buttons * Same with inputs and large inputs * Remove about 10px from height of large inputs/buttons and 4px from regular ones Fixes #8707 and #8700. (Also relevant: #8711) --- less/variables.less | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 71e813d32..a869ce960 100644 --- a/less/variables.less +++ b/less/variables.less @@ -60,15 +60,18 @@ // ------------------------- // Based on 14px font-size and 1.428 line-height (~20px to start) -@padding-base-vertical: 8px; +@padding-base-vertical: 6px; @padding-base-horizontal: 12px; -@padding-large-vertical: 14px; +@padding-large-vertical: 10px; @padding-large-horizontal: 16px; @padding-small-vertical: 5px; @padding-small-horizontal: 10px; +@line-height-large: 1.33; +@line-height-small: 1.5; + @border-radius-base: 4px; @border-radius-large: 6px; @border-radius-small: 3px; @@ -132,8 +135,8 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2); -@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2); +@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-border-color: #e5e5e5; -- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- 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 a869ce960..a500097c9 100644 --- a/less/variables.less +++ b/less/variables.less @@ -180,9 +180,9 @@ // Media queries breakpoints // -------------------------------------------------- -// Tiny screen / phone -@screen-tiny: 480px; -@screen-phone: @screen-tiny; +// Extra small screen / phone +@screen-xsmall: 480px; +@screen-phone: @screen-xsmall; // Small screen / tablet @screen-small: 768px; -- cgit v1.2.3 From 73c048578dfce7c6d4e8c9d4fe6c6bd22b2ff9b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 4 Aug 2013 23:05:54 -0700 Subject: Enable input focus state customization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add new mixin to generate and customize focus state as needed - Adds variable to set default color - Include clear disclaimer about customizing this—it's about users', so don't go making everything bright red and expect them not to be confused or alarmed. Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044 --- 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 a500097c9..b8c7cf6c8 100644 --- a/less/variables.less +++ b/less/variables.less @@ -131,6 +131,7 @@ @input-border: #ccc; @input-border-radius: @border-radius-base; +@input-border-focus: #66afe9; @input-color-placeholder: @gray-light; -- cgit v1.2.3 From 11e46845b2d33889a7aa9bed7e63b686061e1db3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 00:47:23 -0700 Subject: fixes #9063: add var for navbar border radius --- 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 b8c7cf6c8..582457874 100644 --- a/less/variables.less +++ b/less/variables.less @@ -219,6 +219,7 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; +@navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); -- cgit v1.2.3 From 41eef69e6f4d86b5a7ead7abb6d20f0bf6c5404c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 09:02:59 -0700 Subject: Fixes #8786 (part 2): new default button styles Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw --- less/variables.less | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 582457874..a333d45ea 100644 --- a/less/variables.less +++ b/less/variables.less @@ -96,32 +96,30 @@ // Buttons // ------------------------- -@btn-default-color: #fff; -@btn-default-bg: #474949; -@btn-default-border: @btn-default-bg; +@btn-default-color: #333; +@btn-default-bg: #fff; +@btn-default-border: #ccc; -@btn-primary-color: @btn-default-color; +@btn-primary-color: #fff; @btn-primary-bg: @brand-primary; @btn-primary-border: @btn-primary-bg; -@btn-success-color: @btn-default-color; +@btn-success-color: #fff; @btn-success-bg: @brand-success; @btn-success-border: @btn-success-bg; -@btn-warning-color: @btn-default-color; +@btn-warning-color: #fff; @btn-warning-bg: @brand-warning; @btn-warning-border: @btn-warning-bg; -@btn-danger-color: @btn-default-color; +@btn-danger-color: #fff; @btn-danger-bg: @brand-danger; @btn-danger-border: @btn-danger-bg; -@btn-info-color: @btn-default-color; +@btn-info-color: #fff; @btn-info-bg: @brand-info; @btn-info-border: @btn-info-bg; -@btn-hover-color: @btn-default-color; - // Forms // ------------------------- -- cgit v1.2.3 From 01c46bfc0f6f23697326bc5f8d69baa4f7ef3052 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 11:30:50 -0700 Subject: More button updates - Fixes #9113 (caret colors in dropdown buttons) - Darken borders around buttons for contrast in button groups --- less/variables.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index a333d45ea..48c6d88b2 100644 --- a/less/variables.less +++ b/less/variables.less @@ -102,23 +102,23 @@ @btn-primary-color: #fff; @btn-primary-bg: @brand-primary; -@btn-primary-border: @btn-primary-bg; +@btn-primary-border: darken(@btn-primary-bg, 5%); @btn-success-color: #fff; @btn-success-bg: @brand-success; -@btn-success-border: @btn-success-bg; +@btn-success-border: darken(@btn-success-bg, 5%); @btn-warning-color: #fff; @btn-warning-bg: @brand-warning; -@btn-warning-border: @btn-warning-bg; +@btn-warning-border: darken(@btn-warning-bg, 5%); @btn-danger-color: #fff; @btn-danger-bg: @brand-danger; -@btn-danger-border: @btn-danger-bg; +@btn-danger-border: darken(@btn-danger-bg, 5%); @btn-info-color: #fff; @btn-info-bg: @brand-info; -@btn-info-border: @btn-info-bg; +@btn-info-border: darken(@btn-info-bg, 5%); // Forms -- cgit v1.2.3 From 9108ab9fb8a5cf98b50ecd42297b8abd931c0846 Mon Sep 17 00:00:00 2001 From: Markus Maga Date: Tue, 6 Aug 2013 00:06:57 +0200 Subject: Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore) --- 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 582457874..688901ba6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -404,10 +404,12 @@ // Alerts // ------------------------- +@alert-padding: 15px; +@alert-border-radius: @border-radius-base; + @alert-bg: @state-warning-bg; @alert-text: @state-warning-text; @alert-border: @state-warning-border; -@alert-border-radius: @border-radius-base; @alert-success-bg: @state-success-bg; @alert-success-text: @state-success-text; -- cgit v1.2.3 From c4281f39190b99ed543b046430e32ff488092ecd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 15:30:28 -0700 Subject: Update labels to include a base class * Builds on the new button styles by requiring a `.btn-default` for the regular, gray labels * Updates components examples to show new stuff --- 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 48c6d88b2..b3743755c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -375,6 +375,8 @@ // Labels // ------------------------- + +@label-default-bg: @gray-light; @label-success-bg: @brand-success; @label-info-bg: @brand-info; @label-warning-bg: @brand-warning; -- cgit v1.2.3 From db45a60cc86190a060f0baf0b3961cbc690f3a65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 20:55:30 -0700 Subject: Scope tablet classes to tablets range only Fixes #9128 --- 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 27b13c3ab..06e1095dc 100644 --- a/less/variables.less +++ b/less/variables.less @@ -197,14 +197,16 @@ @screen-medium: 992px; @screen-desktop: @screen-medium; -// So media queries don't overlap when required, provide a maximum -@screen-small-max: (@screen-medium - 1); -@screen-tablet-max: @screen-small-max; - // Large screen / wide desktop @screen-large: 1200px; @screen-large-desktop: @screen-large; +// So media queries don't overlap when required, provide a maximum +@screen-small-max: (@screen-medium - 1); +@screen-tablet-max: (@screen-desktop - 1); +@screen-desktop-max: (@screen-large-desktop - 1); + + // Grid system // -------------------------------------------------- -- cgit v1.2.3 From 2f1fcca6c541d45839d39fec94462625526e4bed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 6 Aug 2013 11:18:53 -0700 Subject: Fixes #9145: Fix tooltip opacity Update tooltips to not use RGBa colors so IE8 can have tooltips, too (means we're now using `opacity`). --- 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 06e1095dc..3a9430e2e 100644 --- a/less/variables.less +++ b/less/variables.less @@ -358,7 +358,7 @@ // ------------------------- @tooltip-max-width: 200px; @tooltip-color: #fff; -@tooltip-bg: rgba(0,0,0,.9); +@tooltip-bg: #000; @tooltip-arrow-width: 5px; @tooltip-arrow-color: @tooltip-bg; -- cgit v1.2.3