From 58b90dae1570eca6c921933742bf418ebf3ee47b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 17:47:30 -0700 Subject: [PATCH] addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) --- less/dropdowns.less | 21 ++++++--------------- less/variables.less | 3 +++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/less/dropdowns.less b/less/dropdowns.less index 0dda5c9ceb..d40a82a460 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -4,7 +4,6 @@ // Dropdown arrow/caret -// -------------------- .caret { display: inline-block; width: 0; @@ -18,13 +17,11 @@ } // The dropdown wrapper (div) -// -------------------------- .dropdown { position: relative; } // The dropdown menu (ul) -// ---------------------- .dropdown-menu { position: absolute; top: 100%; @@ -67,7 +64,6 @@ } // Hover/Focus state -// ----------- .dropdown-menu > li > a { &:hover, &:focus { @@ -79,7 +75,6 @@ } // Active state -// ------------ .dropdown-menu > .active > a { &, &:hover, @@ -93,13 +88,14 @@ } // Disabled state -// -------------- +// // Gray out text and ensure the hover/focus state remains gray + .dropdown-menu > .disabled > a { &, &:hover, &:focus { - color: @gray-light; + color: @dropdown-link-disabled-color; } } // Nuke hover/focus effects @@ -115,7 +111,6 @@ } // Open state for the dropdown -// --------------------------- .open { // Show the menu > .dropdown-menu { @@ -129,19 +124,15 @@ } // Dropdown section headers -// --------------------------- .dropdown-header { display: block; padding: 3px 20px; font-size: @font-size-small; line-height: @line-height-base; - color: @gray-light; + color: @dropdown-header-color; } - - // Backdrop to catch body clicks on mobile, etc. -// --------------------------- .dropdown-backdrop { position: fixed; left: 0; @@ -152,16 +143,16 @@ } // Right aligned dropdowns -// --------------------------- .pull-right > .dropdown-menu { right: 0; left: auto; } // Allow for dropdowns to go bottom up (aka, dropup-menu) -// ------------------------------------------------------ +// // Just add .dropup after the standard .dropdown class and you're set, bro. // TODO: abstract this so that the navbar fixed styles are not placed here? + .dropup, .navbar-fixed-bottom .dropdown { // Reverse the caret diff --git a/less/variables.less b/less/variables.less index 991e6587cf..910eebb8db 100644 --- a/less/variables.less +++ b/less/variables.less @@ -163,6 +163,9 @@ @dropdown-link-hover-color: #fff; @dropdown-link-hover-bg: @dropdown-link-active-bg; +@dropdown-link-disabled-color: @gray-light; + +@dropdown-header-color: @gray-light; @dropdown-caret-color: #000;