From 21f8c5f272e0ab9a7acbccaf08feeb9e707d494a Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 21 Dec 2019 13:46:06 +1100 Subject: [PATCH] Fixes styling issue when quick select is forced Replaces #4827 --- modules/system/assets/ui/less/form.less | 9 ++++----- modules/system/assets/ui/storm.css | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less index 075b2fc0a..3ec8b9309 100644 --- a/modules/system/assets/ui/less/form.less +++ b/modules/system/assets/ui/less/form.less @@ -329,13 +329,15 @@ } .field-checkboxlist { - &:not(.is-scrollable) { + .field-checkboxlist-inner { .border-radius(@border-radius-base); background: @color-form-checkboxlist-background; border: 1px solid @color-form-checkboxlist-border; + } + &:not(.is-scrollable) { .field-checkboxlist-inner { - padding: 20px 20px 2px 20px; + padding: 15px 15px 2px 15px; } } @@ -368,10 +370,7 @@ } } - .field-checkboxlist-scrollable { - background: @color-form-checkboxlist-background; - border: 1px solid @color-form-checkboxlist-border; padding-left: 15px; height: @size-large + 100; diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 78c309784..6a758570e 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -4242,14 +4242,14 @@ html.cssanimations .cursor-loading-indicator.hide {display:none} .field-textarea.size-large {min-height:200px} .field-textarea.size-huge {min-height:250px} .field-textarea.size-giant {min-height:350px} -.field-checkboxlist:not(.is-scrollable) {-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px solid #e2e2e2} -.field-checkboxlist:not(.is-scrollable) .field-checkboxlist-inner {padding:20px 20px 2px 20px} +.field-checkboxlist .field-checkboxlist-inner {-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px solid #e2e2e2} +.field-checkboxlist:not(.is-scrollable) .field-checkboxlist-inner {padding:15px 15px 2px 15px} .field-checkboxlist .checkboxlist-controls {display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:baseline;-ms-flex-align:baseline;align-items:baseline} .field-checkboxlist .checkboxlist-controls >div {padding-bottom:7px} .field-checkboxlist .checkboxlist-controls >div >a {font-size:13px;margin-right:20px;text-decoration:none} .field-checkboxlist .checkboxlist-controls >div >a >i {color:#999;margin:0 4px} .field-checkboxlist .checkboxlist-controls >div >a:hover >i {color:#2a3e51} -.field-checkboxlist-scrollable {background:#fff;border:1px solid #e2e2e2;padding-left:15px;height:300px} +.field-checkboxlist-scrollable {padding-left:15px;height:300px} .field-checkboxlist-scrollable .checkbox {margin-top:15px;margin-bottom:5px} .field-checkboxlist-scrollable .checkbox ~ .checkbox {margin-top:0} .field-recordfinder {background-color:#fff;border:1px solid #d1d6d9;overflow:hidden;position:relative;-webkit-box-shadow:inset 0 1px 0 rgba(209,214,217,0.25),0 1px 0 rgba(255,255,255,.5);box-shadow:inset 0 1px 0 rgba(209,214,217,0.25),0 1px 0 rgba(255,255,255,.5);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}