From 17d4c0cedf7061d84437d332af22485e5b991360 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Wed, 8 Jun 2016 06:51:45 +0100
Subject: [PATCH] Rearrange filters order in sidebar

Move the conflict filter to the top, then the content filter, then the
checkbox filters.

This maximises the space available for the conflict filter's dropdown,
and improves the visual "weight" balance going down the sidebar (it now
goes from most visually complex element to least).
---
 src/gui/html/css/style.css |  7 ++-----
 src/gui/html/index.html    | 12 ++++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/gui/html/css/style.css b/src/gui/html/css/style.css
index ed9e3a53..4e254182 100644
--- a/src/gui/html/css/style.css
+++ b/src/gui/html/css/style.css
@@ -74,13 +74,10 @@ div[drawer] > iron-pages {
     height: 48px;
     line-height: 48px;
 }
-#contentFilter {
-    padding: 0 16px;
-    height: 48px;
-}
+#contentFilter,
 #conflictsFilter {
     padding: 0 16px;
-    height: 48px;
+    height: 64px;
 }
 
 /* Panel */
diff --git a/src/gui/html/index.html b/src/gui/html/index.html
index 36db7d4b..61054f55 100644
--- a/src/gui/html/index.html
+++ b/src/gui/html/index.html
@@ -192,6 +192,12 @@
           <!-- Generated <loot-plugin-item> elements go here. -->
         </iron-list>
         <div id="filters">
+          <loot-dropdown-menu id="conflictsFilter" label="Show only conflicting plugins for" value="">
+            <div class="paper-item" value="">No plugin selected</div>
+            <!-- Generated <div> plugin elements go here. -->
+          </loot-dropdown-menu>
+          <paper-input id="contentFilter" label="Show only plugins with cards that contain" always-float-label placeholder="No text specified"></paper-input>
+          <paper-tooltip for="contentFilter" position="bottom">Press Enter or click outside the input to set the filter.</paper-tooltip>
           <paper-checkbox id="hideVersionNumbers" data-class="version">Hide version numbers</paper-checkbox>
           <paper-checkbox id="hideCRCs" data-class="crc">Hide CRCs</paper-checkbox>
           <paper-checkbox id="hideBashTags" data-class="tag">Hide Bash Tags</paper-checkbox>
@@ -200,12 +206,6 @@
           <paper-checkbox id="hideAllPluginMessages">Hide all plugin messages</paper-checkbox>
           <paper-checkbox id="hideInactivePlugins">Hide inactive plugins</paper-checkbox>
           <paper-checkbox id="hideMessagelessPlugins">Hide messageless plugins</paper-checkbox>
-          <paper-input id="contentFilter" label="Show only plugins with cards that contain" always-float-label placeholder="No text specified"></paper-input>
-          <paper-tooltip for="contentFilter" position="bottom">Press Enter or click outside the input to set the filter.</paper-tooltip>
-          <loot-dropdown-menu id="conflictsFilter" label="Show only conflicting plugins for" vertical-align="bottom" value="">
-            <div class="paper-item" value="">No plugin selected</div>
-            <!-- Generated <div> plugin elements go here. -->
-          </loot-dropdown-menu>
           <div id="filtersSpacer"></div>
           <div class="divider"></div>
           <div id="hiddenPlugins">