From dcf0190a3f503f4a791657e1587c542c0b5d15e4 Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 8 Apr 2015 17:54:31 -0400 Subject: [PATCH] Odds and end fixes for dropdown --- RELEASE-NOTES.md | 2 ++ src/definitions/collections/form.less | 1 + src/definitions/modules/dropdown.js | 5 ++++- src/definitions/modules/dropdown.less | 8 +------- src/themes/default/elements/icon.overrides | 1 + src/themes/default/modules/dropdown.variables | 6 ++++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 66c2a82b1..97b9570a5 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -96,6 +96,8 @@ - **Dropdown** - Fixed issue with `search selection` not changing text when reselecting same value from list - **Dropdown** - Dropdown `menu` now use same font size as dropdown - **Dropdown** - Fixed behaviors called on `` change - **Grid** - Fix `doubling row` not working correctly inside a different `doubling grid` (css spec issue) diff --git a/src/definitions/collections/form.less b/src/definitions/collections/form.less index 53e0ccbb4..8bf5e1142 100755 --- a/src/definitions/collections/form.less +++ b/src/definitions/collections/form.less @@ -49,6 +49,7 @@ clear: both; margin: @fieldMargin; } +.ui.form .field .field, .ui.form .fields:last-child, .ui.form .field:last-child { margin-bottom: 0em; diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js index 918ffb371..f83f4aefc 100644 --- a/src/definitions/modules/dropdown.js +++ b/src/definitions/modules/dropdown.js @@ -872,6 +872,7 @@ $.fn.dropdown = function(parameters) { module.event.item.click.call($selectedItem, event); event.stopImmediatePropagation(); } + event.preventDefault(); } // left arrow (hide sub-menu) @@ -969,11 +970,13 @@ $.fn.dropdown = function(parameters) { if(pressedKey == keys.enter) { module.verbose('Enter key pressed, showing dropdown'); module.show(); + event.preventDefault(); } // down arrow (open menu) if(pressedKey == keys.downArrow) { module.verbose('Down key pressed, showing dropdown'); module.show(); + event.preventDefault(); } } } @@ -1197,7 +1200,7 @@ $.fn.dropdown = function(parameters) { ? $(this).attr('value') : name ; - if(settings.placeholder !== 'auto' && value === '') { + if(settings.placeholder === 'auto' && value === '') { select.placeholder = name; } else { diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index 58da2990f..bbc2f0d61 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -522,12 +522,10 @@ select.ui.dropdown { } /* Text Layering */ -.ui.search.dropdown > .pointer > input.search, .ui.search.dropdown > input.search { position: absolute; z-index: 2; } -.ui.search.dropdown > .pointer > .text, .ui.search.dropdown > .text { cursor: text; position: relative; @@ -535,21 +533,16 @@ select.ui.dropdown { } /* Search Selection */ -.ui.search.selection.dropdown > .pointer > input.search, .ui.search.selection.dropdown > input.search { line-height: @searchSelectionLineHeight; padding: @searchSelectionInputPadding; } /* Active/Visible Search */ -.ui.search.dropdown.active > .pointer > input.search, -.ui.search.dropdown.visible > .pointer > input.search, .ui.search.dropdown.active > input.search, .ui.search.dropdown.visible > input.search { cursor: auto; } -.ui.search.dropdown.active > .pointer > .text, -.ui.search.dropdown.visible > .pointer > .text, .ui.search.dropdown.active > .text, .ui.search.dropdown.visible > .text { pointer-events: none; @@ -630,6 +623,7 @@ select.ui.dropdown { position: static; padding: 0; max-width: 100%; + min-height: @searchSelectionLineHeight; line-height: @searchSelectionLineHeight; margin: @multipleSelectionInlineMargin; } diff --git a/src/themes/default/elements/icon.overrides b/src/themes/default/elements/icon.overrides index fe81f3705..79d22ca02 100644 --- a/src/themes/default/elements/icon.overrides +++ b/src/themes/default/elements/icon.overrides @@ -710,6 +710,7 @@ i.icon.target:before { content: "\f140"; } i.icon.play.circle:before { content: "\f144"; } i.icon.pencil.square:before { content: "\f14b"; } i.icon.compass:before { content: "\f14e"; } +i.icon.amex:before { content: "\f1f3"; } i.icon.eur:before { content: "\f153"; } i.icon.gbp:before { content: "\f154"; } i.icon.usd:before { content: "\f155"; } diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables index 09f35fa65..768c577af 100644 --- a/src/themes/default/modules/dropdown.variables +++ b/src/themes/default/modules/dropdown.variables @@ -209,14 +209,16 @@ /* Search Selection */ @searchSelectionLineHeight: 1.2142em; /* browser default for webkit */ @searchSelectionLineHeightOffset: ((@searchSelectionLineHeight - 1em) / 2); -@searchSelectionInputPadding: (@selectionVerticalPadding - @searchSelectionLineHeightOffset) @selectionHorizontalPadding; +@searchSelectionVerticalPadding: (@selectionVerticalPadding - @searchSelectionLineHeightOffset); +@searchSelectionHorizontalPadding: @selectionHorizontalPadding; +@searchSelectionInputPadding: @searchSelectionVerticalPadding @selectionIconDistance @searchSelectionVerticalPadding @searchSelectionHorizontalPadding; @searchMobileMaxMenuHeight: @selectionMobileMaxMenuHeight; @searchTabletMaxMenuHeight: @selectionTabletMaxMenuHeight; @searchComputerMaxMenuHeight: @selectionComputerMaxMenuHeight; @searchWidescreenMaxMenuHeight: @selectionWidescreenMaxMenuHeight; -/* Multiple */ +/* Multiple Selection */ @labelVerticalPadding: 0.4285em; @labelSize: @relativeSmall; @labelHorizontalPadding: @relativeMini;