From a4f4a71fc35aff2642eec1942d50dcb46dcbd9e4 Mon Sep 17 00:00:00 2001 From: vosco88 Date: Thu, 17 Jan 2019 20:33:59 +0100 Subject: [PATCH] Fix reset search button issues (#4068) Fixes #4067 --- modules/system/assets/ui/less/toolbar.less | 36 ++++++++++++---------- modules/system/assets/ui/storm.css | 6 ++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/modules/system/assets/ui/less/toolbar.less b/modules/system/assets/ui/less/toolbar.less index 158218027..791f3411c 100644 --- a/modules/system/assets/ui/less/toolbar.less +++ b/modules/system/assets/ui/less/toolbar.less @@ -28,23 +28,6 @@ right: -8px; } - .clear-input-text { - font-size:large; - color:#666666; - display: inline-block; - position: absolute; - right: 1px; - top: 2px; - background-color: #fff; - padding-left:6px; - height:30px; - border: 0; - } - - .clear-input-text:focus { - outline:none; - } - .toolbar-item { position: relative; white-space: nowrap; @@ -124,6 +107,25 @@ html.mobile { } } +.clear-input-text { + font-size:large; + color:#666666; + display: inline-block; + position: absolute; + right: 1px; + top: 0; + bottom: 0; + margin: auto; + background-color: #fff; + padding-left:7px; + height:28px; + border: 0; +} + +.clear-input-text:focus { + outline:none; +} + // // Editor toolbar // -------------------------------------------------- diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index b4c2f5f67..4448490e6 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -3060,8 +3060,6 @@ a.control-status-list >ul li .status-text.danger:hover {color:#843534} .control-toolbar.scroll-after:after {display:block} .control-toolbar:before {left:-10px} .control-toolbar:after {right:-8px} -.control-toolbar .clear-input-text {font-size:large;color:#666;display:inline-block;position:absolute;right:1px;top:2px;background-color:#fff;padding-left:6px;height:30px;border:0} -.control-toolbar .clear-input-text:focus {outline:none} .control-toolbar .toolbar-item {position:relative;white-space:nowrap;display:table-cell;vertical-align:top;padding-right:20px} .control-toolbar .toolbar-item:last-child, .control-toolbar .toolbar-item.last {padding-right:0} @@ -3089,6 +3087,8 @@ a.control-status-list >ul li .status-text.danger:hover {color:#843534} .control-toolbar .toolbar-item .btn-group .dropdown.last >.btn {border-bottom-right-radius:3px !important;border-top-right-radius:3px !important} .control-toolbar input.form-control[type=text] {height:auto;padding:6px 13px 6px} .control-toolbar.toolbar-padded {padding:20px} +.clear-input-text {font-size:large;color:#666;display:inline-block;position:absolute;top:0;bottom:0;margin:auto;right:1px;background-color:#fff;padding-left:7px;border:0;height:28px} +.clear-input-text:focus {outline:none} [data-control=toolbar] {white-space:nowrap;width:100%;overflow:hidden} html.mobile [data-control=toolbar].is-native-drag {overflow:auto;-webkit-overflow-scrolling:touch} .control-toolbar.editor-toolbar {padding:0;background:#f2f2f2;border-bottom-right-radius:0;border-bottom-left-radius:0;border-bottom:2px solid #d4d8da} @@ -4957,4 +4957,4 @@ ul.autocomplete.dropdown-menu.inspector-autocomplete li a {padding:5px 12px;whit .clockpicker-plate {border:none} .clockpicker-hours .clockpicker-tick {font-size:12px} .clockpicker-hours .clockpicker-tick.tick-inner {font-size:16px} -.clockpicker-minutes .clockpicker-tick {font-size:16px} \ No newline at end of file +.clockpicker-minutes .clockpicker-tick {font-size:16px}