From c10590678019b9b78e0af7893361d005d839c8b5 Mon Sep 17 00:00:00 2001 From: Blake Embrey Date: Mon, 10 Dec 2012 16:42:41 +1000 Subject: Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 --- docs/assets/css/bootstrap.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8ab3cefcf..a4c94eea7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2909,7 +2909,7 @@ table th[class*="span"], border-bottom: 1px solid #ffffff; } -.dropdown-menu li > a { +.dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; @@ -2919,8 +2919,8 @@ table th[class*="span"], white-space: nowrap; } -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, .dropdown-submenu:hover > a { color: #ffffff; text-decoration: none; @@ -2934,8 +2934,8 @@ table th[class*="span"], filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover { color: #ffffff; text-decoration: none; background-color: #0081c2; @@ -2949,12 +2949,12 @@ table th[class*="span"], filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); } -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover { color: #999999; } -.dropdown-menu .disabled > a:hover { +.dropdown-menu > .disabled > a:hover { text-decoration: none; cursor: default; background-color: transparent; -- cgit v1.2.3 From c00f29e4d4e157376c2b24a64bee67bc67e7136a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 00:54:58 -0800 Subject: Fixes #6236: Fix popover font-size in input groups --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9b77c47b8..6a409dd20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1658,7 +1658,9 @@ select:focus:invalid:focus { .input-append .uneditable-input, .input-prepend .uneditable-input, .input-append .dropdown-menu, -.input-prepend .dropdown-menu { +.input-prepend .dropdown-menu, +.input-append .popover, +.input-prepend .popover { font-size: 14px; } -- cgit v1.2.3 From f706acb11cdfaab03ecc7249dee7ed48228a41fa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 01:30:32 -0800 Subject: Fixes #6339: Use important flag on .hide and .show utility classes --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6a409dd20..3c5d69f37 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6053,11 +6053,11 @@ a.badge:hover { } .hide { - display: none; + display: none !important; } .show { - display: block; + display: block !important; } .invisible { -- cgit v1.2.3 From 5e4f663e699d6c03cf6c778d39ecac6cb949e285 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Dec 2012 13:46:07 -0800 Subject: Undo important on hide/show utilties; punt to 3.0 --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5b9b4b34a..785d989c1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6053,11 +6053,11 @@ a.badge:hover { } .hide { - display: none !important; + display: none; } .show { - display: block !important; + display: block; } .invisible { -- cgit v1.2.3