diff --git a/packages/common/src/editors/selectEditor.ts b/packages/common/src/editors/selectEditor.ts index 8b0a004fa..8f804aed4 100644 --- a/packages/common/src/editors/selectEditor.ts +++ b/packages/common/src/editors/selectEditor.ts @@ -743,7 +743,7 @@ export class SelectEditor implements Editor { options += ``; }); } - return ``; + return ``; } /** Create a blank entry that can be added to the collection. It will also reuse the same collection structure provided by the user */ diff --git a/packages/common/src/styles/_variables-theme-material.scss b/packages/common/src/styles/_variables-theme-material.scss index 15450ceb5..a3d748a9a 100644 --- a/packages/common/src/styles/_variables-theme-material.scss +++ b/packages/common/src/styles/_variables-theme-material.scss @@ -126,6 +126,7 @@ $preheader-border-right: 1px solid #e2e2e2 !default $row-move-plugin-cursor: grab !default; $row-move-plugin-icon-color: $icon-color !default; $row-move-plugin-icon: url('data:image/svg+xml,') !default; +$editor-input-height: 100% !default; $editor-input-group-clear-btn-icon-color: $icon-color !default; $editor-input-group-clear-btn-icon: url('data:image/svg+xml,') !default; $editor-input-group-clear-btn-icon-margin-top: inherit !default; @@ -134,7 +135,6 @@ $editor-input-group-clear-btn-icon-size: calc(#{$icon-font-size} + $editor-input-group-clear-btn-icon-vertical-align: initial !default; $editor-input-group-clear-btn-icon-height: 14px !default; $editor-input-group-clear-btn-icon-width: 14px !default; -$slider-editor-height: 26px !default; $row-mouse-hover-color: #ebfaef !default; $row-selected-color: #d4f6d7 !default; $detail-view-icon-collapse-color: $primary-color !default; diff --git a/packages/common/src/styles/_variables-theme-salesforce.scss b/packages/common/src/styles/_variables-theme-salesforce.scss index 8ff4f84d7..a0f975158 100644 --- a/packages/common/src/styles/_variables-theme-salesforce.scss +++ b/packages/common/src/styles/_variables-theme-salesforce.scss @@ -155,6 +155,7 @@ $row-move-plugin-icon-color: $cell-text-color !defaul $row-move-plugin-cursor: grab !default; $row-move-plugin-icon-width: 18px !default; $row-move-plugin-icon: url('data:image/svg+xml,') !default; +$editor-input-height: 100% !default; $editor-input-group-clear-btn-icon-color: $icon-color !default; $editor-input-group-clear-btn-icon: url('data:image/svg+xml,') !default; $editor-input-group-clear-btn-icon-margin-top: inherit !default; @@ -178,7 +179,6 @@ $editor-modal-title-font-weight: var(--lwc-fontWeightLigh $editor-modal-title-line-height: var(--lwc-lineHeightHeading, 1.25) !default; $editor-modal-title-text-align: center !default; $large-editor-button-border-radius: 3px !default; -$slider-editor-height: 24px !default; $slider-filter-thumb-color: #3C97DD !default; $slider-filter-runnable-track-bgcolor: #ECEBEA !default; $row-selected-color: #ECEBEA !default; diff --git a/packages/common/src/styles/_variables.scss b/packages/common/src/styles/_variables.scss index c14ac8954..cdf8dc8bc 100644 --- a/packages/common/src/styles/_variables.scss +++ b/packages/common/src/styles/_variables.scss @@ -511,7 +511,7 @@ $editor-input-group-clear-btn-icon-size: inherit !default; $editor-input-group-clear-btn-icon-height: initial !default; $editor-input-group-clear-btn-icon-width: initial !default; $editor-input-group-clear-btn-icon-vertical-align: middle !default; -$date-editor-input-padding: 6px 2px !default; +$date-editor-input-padding: 0 0 0 2px !default; $date-editor-focus-border-color: $editor-focus-border-color !default; $date-editor-focus-box-shadow: $editor-focus-box-shadow !default; $date-editor-height: $editor-input-height !default; @@ -546,6 +546,7 @@ $slider-editor-runnable-track-padding: 0 6px !default; $slider-editor-number-padding: 4px 6px !default; $slider-editor-focus-border-color: $editor-focus-border-color !default; $slider-editor-focus-box-shadow: $editor-focus-box-shadow !default; +$multiselect-editor-height: $editor-input-height !default; $multiselect-editor-transform: translate(0, -2px) !default; /* Slick Composite Editor Modal */ @@ -648,6 +649,7 @@ $editor-modal-large-editor-footer-line-height: 12px !default; $editor-modal-large-editor-count-color: $large-editor-count-color !default; $editor-modal-large-editor-count-font-size: 10px !default; $editor-modal-large-editor-count-margin: 0 !default; +$editor-modal-multiselect-editor-height: $editor-modal-input-editor-height !default; $editor-modal-slider-editor-value-height: $editor-modal-input-editor-height !default; $editor-modal-slider-editor-value-min-height: 100% !default; $editor-modal-title-font-color: #333333 !default; diff --git a/packages/common/src/styles/slick-editors.scss b/packages/common/src/styles/slick-editors.scss index 89fd2460c..99e4ae0c9 100644 --- a/packages/common/src/styles/slick-editors.scss +++ b/packages/common/src/styles/slick-editors.scss @@ -37,28 +37,36 @@ } } - .slider-editor-input { - &:focus { - outline: 0; - border-color: $slider-editor-focus-border-color; - box-shadow: $slider-editor-focus-box-shadow; + .slider-editor { + height: $slider-editor-height; + .slider-editor-input { + height: $slider-editor-height; + &:focus { + outline: 0; + border-color: $slider-editor-focus-border-color; + box-shadow: $slider-editor-focus-box-shadow; + } } } .input-group { input.editor-text { - height: 24px; margin-left: 0; transform: none; } } - .ms-filter.search-filter { + .ms-filter.select-editor { transform: $multiselect-editor-transform; + height: $multiselect-editor-height; + button.ms-choice { + height: $multiselect-editor-height; + } } .autocomplete-container.input-group, .flatpickr.input-group { + height: $date-editor-height; .input-group-btn { .btn { background-color: #eeeeee; @@ -406,7 +414,8 @@ background-color: $editor-input-disabled-color; } } - .ms-choice { + button.ms-choice { + height: $editor-modal-multiselect-editor-height; &:disabled { background-color: $editor-input-disabled-color; } @@ -426,6 +435,7 @@ .autocomplete-container.input-group, .flatpickr.input-group { + height: $date-editor-height; .input-group-btn { min-width: 28px; .btn { diff --git a/packages/common/src/styles/ui-autocomplete.scss b/packages/common/src/styles/ui-autocomplete.scss index f6cfdd109..245557e79 100644 --- a/packages/common/src/styles/ui-autocomplete.scss +++ b/packages/common/src/styles/ui-autocomplete.scss @@ -4,10 +4,6 @@ // jQuery UI AutoComplete for Bootstrap // --------------------------------------------------------- -.autocomplete-container { - display: flex; - height: 100%; -} .ui-widget-content { background: none; }