From 7e149982d1b43b69e9f5819f05f15349e94a4e05 Mon Sep 17 00:00:00 2001
From: Chris <chris@chrismatic.io>
Date: Thu, 7 May 2015 16:37:13 -0600
Subject: [PATCH] Fix popup save/flush buttons CSS

---
 src/css/popup.css | 10 ++++++----
 src/img/icons.svg |  4 ++--
 src/js/popup.js   |  6 ------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/css/popup.css b/src/css/popup.css
index f3a2f175c..b7002bf7a 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -341,23 +341,25 @@ body.dirty #refresh:hover {
 #saveflushButtonGroup {
     display: none;
     position: fixed;
+    left: 4px;
 }
 #saveRules,
 #flushRules {
+    display: inline-block;
     opacity: 0.7;
     background-color: #444;
     border-radius: 4px;
     color: rgba(255, 255, 255, 0.8);
     cursor: pointer;
-    font-size: 35px;
-    height: 35px;
+    font-size: 30px;
+    height: 30px;
     padding: 8px;
     text-align: center;
     }
 #firewallContainer.dirty ~ #saveflushButtonGroup {
     display: block;
     }
-#firewallContainer.dirty ~ #saveRules:hover,
-#firewallContainer.dirty ~ #flushRules:hover {
+#saveRules:hover,
+#flushRules:hover {
     opacity: 1;
     }
diff --git a/src/img/icons.svg b/src/img/icons.svg
index 3bfa57963..0f6944fc8 100755
--- a/src/img/icons.svg
+++ b/src/img/icons.svg
@@ -4,9 +4,9 @@
     <title>save</title>
     <path class="path1" d="M128 384h192v-96h-192v96zM352 384h32v-224q0-3.5-2.5-9.625t-5-8.625l-70.25-70.25q-2.5-2.5-8.5-5t-9.75-2.5v104q0 10-7 17t-17 7h-144q-10 0-17-7t-7-17v-104h-32v320h32v-104q0-10 7-17t17-7h208q10 0 17 7t7 17v104zM256 152v-80q0-3.25-2.375-5.625t-5.625-2.375h-48q-3.25 0-5.625 2.375t-2.375 5.625v80q0 3.25 2.375 5.625t5.625 2.375h48q3.25 0 5.625-2.375t2.375-5.625zM416 160v232q0 10-7 17t-17 7h-336q-10 0-17-7t-7-17v-336q0-10 7-17t17-7h232q10 0 22 5t19 12l70 70q7 7 12 19t5 22z"></path>
 </symbol>
-<symbol id="icon-trash" viewBox="0 0 1024 1024">
+<symbol id="icon-trash" viewBox="0 0 416 448">
     <title>trash</title>
-    <path class="path1" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z"></path>
+    <path class="path1" d="M159.999 184v144q0 3.5-2.25 5.75t-5.75 2.25h-16q-3.5 0-5.75-2.25t-2.25-5.75v-144q0-3.5 2.25-5.75t5.75-2.25h16q3.5 0 5.75 2.25t2.25 5.75zM224 184v144q0 3.5-2.25 5.75t-5.75 2.25h-16q-3.5 0-5.75-2.25t-2.25-5.75v-144q0-3.5 2.25-5.75t5.75-2.25h16q3.5 0 5.75 2.25t2.25 5.75zM288 184v144q0 3.5-2.25 5.75t-5.75 2.25h-16q-3.5 0-5.75-2.25t-2.25-5.75v-144q0-3.5 2.25-5.75t5.75-2.25h16q3.5 0 5.75 2.25t2.25 5.75zM320 365v-237h-224v237q0 5.5 1.75 10.125t3.625 6.75 2.625 2.125h208q0.75 0 2.625-2.125t3.625-6.75 1.75-10.125zM152 96h112l-12-29.25q-1.75-2.25-4.25-2.75h-79.25q-2.5 0.5-4.25 2.75zM383.999 104v16q0 3.5-2.25 5.75t-5.75 2.25h-24v237q0 20.75-11.75 35.875t-28.25 15.125h-208q-16.5 0-28.25-14.625t-11.75-35.375v-238h-24q-3.5 0-5.75-2.25t-2.25-5.75v-16q0-3.5 2.25-5.75t5.75-2.25h77.25l17.5-41.75q3.75-9.25 13.5-15.75t19.75-6.5h80q10 0 19.75 6.5t13.5 15.75l17.5 41.75h77.25q3.5 0 5.75 2.25t2.25 5.75z"></path>
 </symbol>
 <symbol id="icon-power" viewBox="0 0 1024 1024">
     <title>power</title>
diff --git a/src/js/popup.js b/src/js/popup.js
index 820093b14..04876a30b 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -325,12 +325,6 @@ var buildAllFirewallRows = function() {
     // - Its horizontal position depends on whether there is a vertical
     //   scrollbar.
     updateAllFirewallCells();
-    setTimeout(updateDfButtonsPosition, 500);
-};
-
-var updateDfButtonsPosition = function() {
-    var rect = document.getElementById('firewallContainer').getBoundingClientRect();
-    document.getElementById('saveflushButtonGroup').style.setProperty('left', (rect.left + 4) + 'px');
 };
 
 /******************************************************************************/