From 63164074e2e8e93eded471920ad71c60a78023af Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 27 Mar 2015 18:34:35 -0400 Subject: [PATCH] Fixes height on scrolling menu, adds dividers --- src/definitions/modules/dropdown.js | 2 +- src/definitions/modules/dropdown.less | 6 ++++++ src/themes/default/modules/dropdown.variables | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 0f3a244b7..bf844a7c1 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -973,7 +973,7 @@ $.fn.dropdown = function(parameters) { ? callback : function(){} ; - if($target.is($module) || $target.is($icon) || $target.is($text)) { + if($target.closest($menu).length == 0) { module.verbose('Triggering event', callback); callback(); return true; diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index 68f9d7be3..d75dd1a97 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -928,6 +928,12 @@ select.ui.dropdown { border: none; border-top: 1px solid @menuBorderColor; } +.ui.dropdown .scrolling.menu .item { + border-top: @scrollingMenuItemBorder; +} +.ui.dropdown .scrolling.menu .item:first-child { + border-top: none; +} .ui.dropdown > .animating.menu .scrolling.menu, .ui.dropdown > .visible.menu .scrolling.menu { display: block; diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables index 9e177475a..bef432fe0 100644 --- a/src/themes/default/modules/dropdown.variables +++ b/src/themes/default/modules/dropdown.variables @@ -115,13 +115,14 @@ @selectionMinWidth: 200px; @selectionBackground: @white; @selectionDisplay: inline-block; -@selectionItemDivider: 1px solid rgba(0, 0, 0, 0.05); @selectionVerticalPadding: 0.78571em; @selectionHorizontalPadding: 1.1em; @selectionIconDistance: 2em; @selectionPadding: @selectionVerticalPadding @selectionIconDistance @selectionVerticalPadding @selectionHorizontalPadding; @selectionZIndex: 10; +@selectionItemDivider: 1px solid rgba(0, 0, 0, 0.05); + /*