Merge pull request ome#5756 from will-moore/group_user_search_css_fix

group user search css fix
melissalinkert · Jul 5, 2018 · 95e6e73 · 95e6e73
2 parents 63d4945 + f6ab12f
commit 95e6e73
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/experimenters.html b/components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/experimenters.html
@@ -63,13 +63,6 @@
 {% if experimenterList %}
 
 <div class="one_column_header">
-    <form class="search filtersearch" id="filtersearch" action="#">
-        <input type="text" id="id_search">
-        <input type="submit" value="Go" />
-        <span class="loading">
-            <img class="loader" alt="Loading" src="{% static "webgateway/img/spinner.gif" %}">
-        </span>
-    </form>
 
     {% if can_modify_user and ome.can_create %}
     <div class="btn blue">
@@ -79,6 +72,14 @@
     </div>
     {% endif %}
 
+    <form class="search filtersearch" id="filtersearch" action="#" style="width: 160px">
+        <input type="text" id="id_search">
+        <input type="submit" value="Go" />
+        <span class="loading">
+            <img class="loader" alt="Loading" src="{% static "webgateway/img/spinner.gif" %}">
+        </span>
+    </form>
+
 </div>
 
 

diff --git a/components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/groups.html b/components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/groups.html
@@ -61,13 +61,6 @@
 {% if groups %}
 
 <div class="one_column_header">
-    <form class="search filtersearch" id="filtersearch" action="#">
-        <input type="text" id="id_search">
-        <input type="submit" value="Go" />
-        <span class="loading">
-            <img class="loader" alt="Loading" src="{% static "webgateway/img/spinner.gif" %}">
-        </span>
-    </form>
 
     {% if can_modify_group and ome.can_create %}
         <div class="btn blue">
@@ -77,6 +70,13 @@
         </div>
     {% endif %}
 
+    <form class="search filtersearch" id="filtersearch" action="#" style="width:160px">
+        <input type="text" id="id_search">
+        <input type="submit" value="Go" />
+        <span class="loading">
+            <img class="loader" alt="Loading" src="{% static "webgateway/img/spinner.gif" %}">
+        </span>
+    </form>
 </div>
 
 <table id="groupTable" class="tablesorter tablesorter_basic">

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css b/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css
@@ -976,6 +976,7 @@ button::-moz-focus-inner {
 		-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.2), inset 0 1px 1px rgba(0,0,0,.2);
 		-moz-box-shadow: 0 1px 0 rgba(255,255,255,.2), inset 0 1px 1px rgba(0,0,0,.2);
 		box-shadow: 0 1px 0 rgba(255,255,255,.15), inset 0 1px 2px rgba(0,0,0,.3);
+		right: 0;
 	}
 
 	#search input[type=submit], .filtersearch input[type=submit]{
@@ -996,10 +997,6 @@ button::-moz-focus-inner {
 		        transition:   opacity .2s linear; 
 	}
 
-	.filtersearch input[type=submit] {
-		right:22px;
-	}
-
 	#search input[type=submit]:hover, .filtersearch input[type=submit]:hover {
 		opacity:.6;
 		cursor:pointer;
@@ -1059,8 +1056,8 @@ button::-moz-focus-inner {
 
 		.filtersearch .loading {
 			position:absolute;
-			right:-4px;
-			top:2px;
+			left: 110%;
+			top: 6px;
 		}
 
 	/* same as .filtersearch label for top search field */

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css b/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css
@@ -1556,6 +1556,7 @@
 				border:solid 1px rgba(0,0,0,.3);
 				border-top:solid 1px rgba(0,0,0,.4);
 				color:#333;
+				box-sizing: border-box;
 			}