From f06078f4ac8672bd49b0ec6a57947e103a4d2cf9 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Sat, 11 Apr 2020 22:25:34 +1000
Subject: [PATCH] CSS tweaks

- Still doesn't look exactly right
---
 InvenTree/InvenTree/static/css/inventree.css     |  9 ++++++++-
 .../InvenTree/static/script/inventree/filters.js | 16 +++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 1bd35052c2..379cf2ebac 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -176,7 +176,8 @@
     vertical-align: middle;
     margin: 1px;
     padding: 2px;
-    border: 1px solid #aaa;
+    background: #eee;
+    border: 1px solid #eee;
     border-radius: 3px;
 }
 
@@ -206,6 +207,12 @@
     margin-right: 5px;
 }
 
+.filter-input {
+    display: inline-block;
+    *display: inline;
+    zoom: 1;
+}
+
 .filter-tag:hover {
     background: #ddd;
 }
diff --git a/InvenTree/InvenTree/static/script/inventree/filters.js b/InvenTree/InvenTree/static/script/inventree/filters.js
index 2aa57b913c..f59645bf8a 100644
--- a/InvenTree/InvenTree/static/script/inventree/filters.js
+++ b/InvenTree/InvenTree/static/script/inventree/filters.js
@@ -185,7 +185,7 @@ function generateAvailableFilterList(tableKey) {
     
     var id = 'filter-tag-' + tableKey.toLowerCase();
 
-    var html = `<select class='form-control' id='${id}' name='tag'>`;
+    var html = `<select class='form-control filter-input' id='${id}' name='tag'>`;
     
     html += `<option value=''>Select filter</option>`;
 
@@ -209,7 +209,7 @@ function generateFilterInput(tableKey, filterKey) {
 
     if (filterKey == null || filterKey.length == 0) {
         // Return an 'empty' element
-        return `<div id='${id}'></div>`;
+        return `<div class='filter-input' id='${id}'></div>`;
     }
 
     var options = getFilterOptionList(tableKey, filterKey);
@@ -218,10 +218,10 @@ function generateFilterInput(tableKey, filterKey) {
 
     // A 'null' options list means that a simple text-input dialog should be used
     if (options == null) {
-        html = `<input class='form-control' id='${id}' name='value'></input>`;
+        html = `<input class='form-control filter-input' id='${id}' name='value'></input>`;
     } else {
         // Return a 'select' input with the available values
-        html = `<select class='form-control' id='${id}' name='value'>`;
+        html = `<select class='form-control filter-input' id='${id}' name='value'>`;
 
         for (var key in options) {
             option = options[key];
@@ -286,14 +286,16 @@ function setupFilterList(tableKey, table, target) {
 
             addClicked = true;
 
-            var html = '<div>';
+            var html = '';
+            
+            //`<div class='filter-input'>`;
 
             html += generateAvailableFilterList(tableKey);
             html += generateFilterInput(tableKey);
 
-            html += `<button class='btn btn-default' id='${make}'>Add</button>`;
+            html += `<button title='Create filter' class='btn btn-default filter-tag' id='${make}'><span class='fas fa-plus'></span></button>`;
 
-            html += '</div>';
+            //html += '</div>';
 
             element.append(html);