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/alerts.less | 2 +- less/badges.less | 6 +++--- less/button-groups.less | 4 ++-- less/buttons.less | 6 +++--- less/carousel.less | 8 ++++---- less/close.less | 4 ++-- less/variables.less | 24 ++++++++++++++++++++++-- 7 files changed, 37 insertions(+), 17 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index 66aa6cf24..02ca8a201 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -26,7 +26,7 @@ } // Provide class for links that match alerts .alert-link { - font-weight: 500; + font-weight: @alert-link-font-weight; color: darken(@alert-text, 10%); } diff --git a/less/badges.less b/less/badges.less index 216d6014b..6e7ae08f9 100644 --- a/less/badges.less +++ b/less/badges.less @@ -9,14 +9,14 @@ min-width: 10px; padding: 3px 7px; font-size: @font-size-small; - font-weight: bold; + font-weight: @badge-font-weight; color: @badge-color; - line-height: 1; + line-height: @badge-line-height; vertical-align: middle; white-space: nowrap; text-align: center; background-color: @badge-bg; - border-radius: 10px; + border-radius: @badge-border-radius; // Empty labels/badges collapse &:empty { diff --git a/less/button-groups.less b/less/button-groups.less index f345f4e13..9fe96df92 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -117,11 +117,11 @@ } // Carets in other button sizes .btn-large .caret { - border-width: 5px; + border-width: @btn-large-caret-border-width; } // Upside down carets for .dropup .dropup .btn-large .caret { - border-bottom-width: 5px; + border-bottom-width: @btn-large-caret-border-width; } diff --git a/less/buttons.less b/less/buttons.less index b8bbfc6cf..9d6289518 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -12,7 +12,7 @@ padding: @padding-base-vertical @padding-base-horizontal; margin-bottom: 0; // For input.btn font-size: @font-size-base; - font-weight: 500; + font-weight: @font-weight-base; line-height: @line-height-base; text-align: center; vertical-align: middle; @@ -109,7 +109,7 @@ fieldset[disabled] & { &:hover, &:focus { - color: @gray-dark; + color: @btn-link-disabled-color; text-decoration: none; } } @@ -127,7 +127,7 @@ .btn-small { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; - line-height: 1.5; // ensure proper height of button next to small input + line-height: @btn-small-line-height; // ensure proper height of button next to small input border-radius: @border-radius-small; } diff --git a/less/carousel.less b/less/carousel.less index 3526089c2..98ce5916b 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -69,9 +69,9 @@ top: 0; left: 0; bottom: 0; - width: 15%; - .opacity(.5); - font-size: 20px; + width: @carousel-control-width; + .opacity(@carousel-control-opacity); + font-size: @carousel-control-font-size; color: @carousel-control-color; text-align: center; text-shadow: @carousel-text-shadow; @@ -133,7 +133,7 @@ bottom: 10px; left: 50%; z-index: 15; - width: 120px; + width: @carousel-indicators-width; margin-left: -60px; padding-left: 0; list-style: none; diff --git a/less/close.less b/less/close.less index f915667e5..a2936ec2f 100644 --- a/less/close.less +++ b/less/close.less @@ -6,8 +6,8 @@ .close { float: right; font-size: (@font-size-base * 1.5); - font-weight: bold; - line-height: 1; + font-weight: @close-font-weight; + line-height: @close-line-height; color: @close-color; text-shadow: @close-text-shadow; .opacity(.2); 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 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/alerts.less | 2 +- less/variables.less | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/alerts.less b/less/alerts.less index 75e142d8f..d8ec20590 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -7,7 +7,7 @@ // ------------------------- .alert { - padding: 15px 35px 15px 15px; + padding: @alert-padding (@alert-padding + 20) @alert-padding @alert-padding; margin-bottom: @line-height-computed; color: @alert-text; background-color: @alert-bg; 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 7bc817bcbaa26bca46dcbd2e8a1c299d1f7c4097 Mon Sep 17 00:00:00 2001 From: geedmo Date: Mon, 5 Aug 2013 19:43:39 -0300 Subject: Fix Issue #8175 --- less/input-groups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index 79d1afcd4..21b07922b 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -48,7 +48,7 @@ padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; - line-height: @line-height-base; + line-height: 1; text-align: center; background-color: @gray-lighter; border: 1px solid @input-group-addon-border-color; -- cgit v1.2.3 From c2737771b4e9b63655081c91878c6e66d9c3105a Mon Sep 17 00:00:00 2001 From: geedmo Date: Mon, 5 Aug 2013 19:58:38 -0300 Subject: Fix Issue #8175 - remove lh for input-lg|sm --- less/input-groups.less | 2 -- 1 file changed, 2 deletions(-) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index 21b07922b..6b832c3f1 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -59,13 +59,11 @@ padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; - line-height: @line-height-small; } &.input-lg { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; - line-height: @line-height-large; } // Nuke default margins from checkboxes and radios to vertically center within. -- cgit v1.2.3 From 98df9495cc92bd710a6d55c4d535da7aaf730031 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 16:15:36 -0700 Subject: remove dupe border-box --- less/input-groups.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less') diff --git a/less/input-groups.less b/less/input-groups.less index 79d1afcd4..5e1ecae7f 100644 --- a/less/input-groups.less +++ b/less/input-groups.less @@ -44,7 +44,6 @@ // Text input groups // ------------------------- .input-group-addon { - .box-sizing(border-box); padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; font-weight: normal; -- cgit v1.2.3 From f3bd6dbf0356033e110fa13856c6ea28fa6623e9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Aug 2013 16:16:58 -0700 Subject: fixes #8647: remove focus outline on :focus of buttons in button groups --- less/button-groups.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 3b6a4e8b3..3ae18e92f 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -47,6 +47,10 @@ &.active { z-index: 2; } + &:focus { + // Remove focus outline when dropdown JS adds it after closing the menu + outline: none; + } } } -- cgit v1.2.3