From 46e4fb31338807be1535208fb07dfc3fff89fe08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 00:56:03 -0700 Subject: remove active state from buttons by moving the :active before :disabled --- bootstrap-1.2.0.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index c324bee3e..7746a57d4 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 00:52:12 PDT 2011 + * Date: Fri Sep 2 00:54:51 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1564,6 +1564,11 @@ footer { border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } +.btn:active { + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); +} .btn.disabled { cursor: default; background-image: none; @@ -1586,11 +1591,6 @@ footer { -moz-box-shadow: none; box-shadow: none; } -.btn:active { - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -} .btn.large { font-size: 16px; line-height: normal; -- cgit v1.2.3 From 411e32434095c9b6e9def4114d84df371e8e5d20 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 00:58:07 -0700 Subject: fix dropdown bug, remove second topbar from docs now --- bootstrap-1.2.0.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 7746a57d4..105de8a6d 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 00:54:51 PDT 2011 + * Date: Fri Sep 2 00:57:14 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1224,7 +1224,10 @@ table .headerSortUp.purple, table .headerSortDown.purple { margin-left: 10px; margin-right: 0; } -.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu { +.topbar div > ul.secondary-nav .menu-dropdown, +.nav.secondary-nav .menu-dropdown, +.topbar div > ul.secondary-nav .dropdown-menu, +.nav.secondary-nav .dropdown-menu { right: 0; } .topbar div > ul a.menu:hover, -- cgit v1.2.3 From db830140eea8e38c09cb80ff970f197b7ea1a11a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 01:03:16 -0700 Subject: add old dropdown support to tabs dropdowns --- bootstrap-1.2.0.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 105de8a6d..aa942eeaf 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 00:57:14 PDT 2011 + * Date: Fri Sep 2 01:03:07 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1449,19 +1449,19 @@ a.menu:after, .dropdown-toggle:after { border-bottom: 0; color: #808080; } -.tabs .dropdown-menu { +.tabs .menu-dropdown, .tabs .dropdown-menu { top: 35px; border-width: 1px; -webkit-border-radius: 0 6px 6px 6px; -moz-border-radius: 0 6px 6px 6px; border-radius: 0 6px 6px 6px; } -.tabs .dropdown-toggle:after { +.tabs a.menu:after, .tabs .dropdown-toggle:after { border-top-color: #999; margin-top: 15px; margin-left: 5px; } -.tabs .dropdown.open .dropdown-toggle:after { +.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after { border-top-color: #555; } .pills a { -- cgit v1.2.3 From 3f2292514431b5ac4ca00776ff8348b5ca4c662b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 09:35:26 -0700 Subject: remove fixed width from topbar form to allow for applying classes to resize it --- bootstrap-1.2.0.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index aa942eeaf..68f884cc6 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 01:03:07 PDT 2011 + * Date: Fri Sep 2 09:34:28 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1141,7 +1141,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { font-size: normal; font-weight: 13px; line-height: 1; - width: 220px; padding: 4px 9px; color: #fff; color: rgba(255, 255, 255, 0.75); -- cgit v1.2.3 From b18633ee144789cf1c64b23040239223c5a2a1d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 09:48:31 -0700 Subject: cleanup and tweaks --- bootstrap-1.2.0.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap-1.2.0.css') diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index 68f884cc6..708070985 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 2 09:34:28 PDT 2011 + * Date: Fri Sep 2 09:48:25 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). -- cgit v1.2.3