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/button-groups.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/button-groups.less') 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; } -- cgit v1.2.3 From 56aedcb71397c867396455b6860d627c1efe2707 Mon Sep 17 00:00:00 2001 From: liuyl Date: Thu, 1 Aug 2013 11:26:12 +0800 Subject: add table-layout --- less/button-groups.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index d78815c93..4ee5616f3 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -157,6 +157,7 @@ .btn-group-justified { display: table; width: 100%; + table-layout: fixed; .btn { float: none; display: table-cell; -- 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/button-groups.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index 4ee5616f3..d8eae0a50 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -100,7 +100,7 @@ padding-left: 8px; padding-right: 8px; } -.btn-group > .btn-large + .dropdown-toggle { +.btn-group > .btn-lg + .dropdown-toggle { padding-left: 12px; padding-right: 12px; } @@ -117,11 +117,11 @@ margin-left: 0; } // Carets in other button sizes -.btn-large .caret { +.btn-lg .caret { border-width: 5px; } // Upside down carets for .dropup -.dropup .btn-large .caret { +.dropup .btn-lg .caret { border-bottom-width: 5px; } -- cgit v1.2.3 From 584759eac0839feeaf5fbde339e772d389dda16f Mon Sep 17 00:00:00 2001 From: liuyl Date: Mon, 5 Aug 2013 08:29:01 +0800 Subject: btngroups --- less/button-groups.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index d8eae0a50..ffa468184 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -142,10 +142,10 @@ &:not(:first-child):not(:last-child) { border-radius: 0; } - &:first-child { + &:first-child:not(:last-child) { .border-bottom-radius(0); } - &:last-child { + &:last-child:not(:first-child) { .border-top-radius(0); } } -- cgit v1.2.3 From d95ff9da81057ed0abb12dcfe9a8422416916516 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 4 Aug 2013 23:27:15 -0700 Subject: fixes #8805: ensure .active buttons in button groups behave like :active buttons --- less/button-groups.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index ffa468184..ac58b38ce 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -22,7 +22,8 @@ // Bring the "active" button to the front &:hover, &:focus, - &:active { + &:active, + &.active { z-index: 2; } } -- 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/button-groups.less | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'less/button-groups.less') diff --git a/less/button-groups.less b/less/button-groups.less index ac58b38ce..76936691a 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -3,11 +3,32 @@ // -------------------------------------------------- // Button carets -.btn .caret { - border-top-color: @btn-default-color; +// +// Match the button text color to the arrow/caret for indicating dropdown-ness. + +.caret { + .btn-default & { + border-top-color: @btn-default-color; + } + .btn-primary &, + .btn-success &, + .btn-warning &, + .btn-danger &, + .btn-info & { + border-top-color: #fff; + } } -.dropup .btn .caret { - border-bottom-color: @btn-default-color; +.dropup .caret { + .btn-default & { + border-bottom-color: @btn-default-color; + } + .btn-primary &, + .btn-success &, + .btn-warning &, + .btn-danger &, + .btn-info & { + border-bottom-color: #fff; + } } // Make the div behave like a button -- 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/button-groups.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