From 978cd4bb7764cb4bbc017da1164043d0f509d75c Mon Sep 17 00:00:00 2001
From: unknown <davidback3@gmail.com>
Date: Fri, 12 Oct 2018 18:57:26 -0700
Subject: [PATCH] styling tweaks, fix X clear search not refreshing

---
 scripts/system/html/css/edit-style.css | 15 ++++++++-------
 scripts/system/html/entityList.html    |  2 +-
 scripts/system/html/js/entityList.js   |  9 +--------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 69fed02099..699c27448a 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -265,7 +265,6 @@ input[type="search"]::-webkit-search-cancel-button {
     -webkit-appearance: none;
     height: 20px;
     width: 20px;
-    border-radius:10px;
     background-image: url('data:image/png;base64,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')
 }
 
@@ -1084,11 +1083,13 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
     height: 25px;
 }
 #filter-type-checkboxes span {
+    position: relative;
+    top: 3px;
     font-family: hifi-glyphs;
     font-size: 16px;
     color: #404040;
-    padding: 12px 12px;
-    vertical-align: middle;
+    padding-left: 12px;
+    padding-right: 12px;
 }
 #filter-type-checkboxes label {
     position: relative;
@@ -1098,16 +1099,16 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
     font-family: FiraSans-SemiBold;
     color: #404040;
     background-color: #afafaf;
-    padding: 0 20px;
-    height: 25px;
-    vertical-align: middle;
+    padding-top: 1px;
+    padding-right: 12px;
+    height: 24px;
 }
 #filter-type-checkboxes label:hover {
     background-color: #1e90ff;
 }
 #filter-type-checkboxes input[type=checkbox] {
     position: relative;
-    top: 4px;
+    top: 6px;
     right: -10px;
     z-index: 4;
     display: block;
diff --git a/scripts/system/html/entityList.html b/scripts/system/html/entityList.html
index 626402362d..06c2be8e73 100644
--- a/scripts/system/html/entityList.html
+++ b/scripts/system/html/entityList.html
@@ -39,7 +39,7 @@
 						<div class="overSelect"></div>
 					</div>
 					<div id="filter-type-checkboxes">
-						<!-- each type checkbox/label is added at runtime in entityList -->
+						<!-- type options with checkbox, icon, and label are added at runtime in entityList -->
 					</div>
 				</div>
 				<div id="filter-search-and-icon">
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index f780fd0e2e..0f3f27a547 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -201,9 +201,7 @@ function loaded() {
             EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' }));
         }
         elFilterSearch.onkeyup = refreshEntityList;
-        elFilterSearch.onpaste = refreshEntityList;
-        elFilterSearch.onchange = onFilterChange;
-        elFilterSearch.onblur = refreshFooter;
+        elFilterSearch.onsearch = refreshEntityList;
         elFilterInView.onclick = toggleFilterInView;
         elFilterRadius.onchange = onRadiusChange;
         elInfoToggle.onclick = toggleInfo;
@@ -650,11 +648,6 @@ function loaded() {
             refreshEntities();
         }
         
-        function onFilterChange() {
-            refreshEntityList();
-            entityList.resize();
-        }
-        
         function onRadiusChange() {
             elFilterRadius.value = Math.max(elFilterRadius.value, 0);
             elNoEntitiesRadius.firstChild.nodeValue = elFilterRadius.value;