From e57758cbb453602549742360120653e08863671f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 23:54:09 -0700 Subject: [PATCH] Drop `.nav-header` for `.dropdown-header` * Since we no longer have `.nav-list`, I've nuked the `.nav-header` * However, dropdowns can still have section headings, so I've kept that around with the addition of `.dropdown-header` * Restyled it a smidge as well --- docs/_includes/nav-components.html | 1 + docs/assets/css/bootstrap.css | 24 ++++++++---------------- docs/components.html | 25 +++++++++++++++++++++++++ less/dropdowns.less | 19 +++++++++++-------- less/navs.less | 16 ---------------- 5 files changed, 45 insertions(+), 40 deletions(-) diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index ed00b62fa3..514dcfed3c 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -3,6 +3,7 @@ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e625405e23..2377695219 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2275,6 +2275,14 @@ input[type="button"].btn-block { outline: 0; } +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: 12px; + line-height: 1.428571429; + color: #999999; +} + .dropdown-backdrop { position: fixed; top: 0; @@ -2303,11 +2311,6 @@ input[type="button"].btn-block { margin-bottom: 1px; } -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - .list-group { padding-left: 0; margin-bottom: 20px; @@ -2710,17 +2713,6 @@ button.close { text-align: center; } -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 1.428571429; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - .tabbable:before, .tabbable:after { display: table; diff --git a/docs/components.html b/docs/components.html index 5cc3a1e280..9202b133a1 100644 --- a/docs/components.html +++ b/docs/components.html @@ -46,6 +46,31 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na +{% endhighlight %} + + +

Add a header to break up label sections of actions in any dropdown menu.

+
+ +
+{% highlight html %} + {% endhighlight %} diff --git a/less/dropdowns.less b/less/dropdowns.less index 8ae9dbba15..7e35d42871 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -120,6 +120,17 @@ } } +// Dropdown section headers +// --------------------------- +.dropdown-header { + display: block; + padding: 3px 20px; + font-size: @font-size-small; + line-height: @line-height-base; + color: @gray-light; +} + + // Backdrop to catch body clicks on mobile, etc. // --------------------------- @@ -158,11 +169,3 @@ margin-bottom: 1px; } } - -// Tweak nav headers -// --------------------------- -// Increase padding from 15px to 20px on sides -.dropdown .dropdown-menu .nav-header { - padding-left: 20px; - padding-right: 20px; -} diff --git a/less/navs.less b/less/navs.less index 87780a156f..9f671643a7 100644 --- a/less/navs.less +++ b/less/navs.less @@ -195,22 +195,6 @@ -// Nav headers (for dropdowns and lists) -// ------------------------- - -.nav-header { - display: block; - padding: 3px 15px; - font-size: @font-size-mini; - font-weight: bold; - line-height: @line-height-base; - color: @gray-light; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} - - - // Tabbable tabs // -------------------------