[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [snowflake/master] Move icons/ to assets/



commit b324d9d42fff09e7db0f2fe2657a2265a3b39271
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Wed Jul 31 17:59:48 2019 -0400

    Move icons/ to assets/
    
    There's a default alias for icons/ in apache,
    https://www.electrictoolbox.com/apache-icons-directory/
---
 .gitignore                                            |   2 +-
 proxy/init-webext.js                                  |   8 ++++----
 proxy/make.js                                         |   2 +-
 proxy/static/{icons => assets}/arrowhead-right-12.svg |   0
 proxy/static/{icons => assets}/status-off.png         | Bin
 proxy/static/{icons => assets}/status-off.svg         |   0
 proxy/static/{icons => assets}/status-off@xxxxxx      | Bin
 proxy/static/{icons => assets}/status-off@xxxxxx      | Bin
 proxy/static/{icons => assets}/status-on.png          | Bin
 proxy/static/{icons => assets}/status-on.svg          |   0
 proxy/static/{icons => assets}/status-on@xxxxxx       | Bin
 proxy/static/{icons => assets}/status-on@xxxxxx       | Bin
 proxy/static/{icons => assets}/status-running.png     | Bin
 proxy/static/{icons => assets}/status-running.svg     |   0
 proxy/static/embed.css                                |   2 +-
 proxy/static/embed.html                               |   2 +-
 proxy/static/popup.js                                 |   2 +-
 proxy/webext/manifest.json                            |   2 +-
 18 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 315500c..f3af78e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,6 @@ proxy/webext/snowflake.js
 proxy/webext/popup.js
 proxy/webext/embed.html
 proxy/webext/embed.css
-proxy/webext/icons/
+proxy/webext/assets/
 ignore/
 npm-debug.log
diff --git a/proxy/init-webext.js b/proxy/init-webext.js
index c5caf67..05a46f6 100644
--- a/proxy/init-webext.js
+++ b/proxy/init-webext.js
@@ -78,13 +78,13 @@ class WebExtUI extends UI {
     if (this.active) {
       return chrome.browserAction.setIcon({
         path: {
-          32: "icons/status-running.png"
+          32: "assets/status-running.png"
         }
       });
     } else {
       return chrome.browserAction.setIcon({
         path: {
-          32: "icons/status-on.png"
+          32: "assets/status-on.png"
         }
       });
     }
@@ -94,7 +94,7 @@ class WebExtUI extends UI {
     update();
     return chrome.browserAction.setIcon({
       path: {
-        32: "icons/status-" + (enabled ? "on" : "off") + ".png"
+        32: "assets/status-" + (enabled ? "on" : "off") + ".png"
       }
     });
   }
@@ -142,7 +142,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific
         missingFeature: true
       });
     });
-    chrome.browserAction.setIcon({ path: { 32: "icons/status-off.png" } });
+    chrome.browserAction.setIcon({ path: { 32: "assets/status-off.png" } });
     return;
   }
 
diff --git a/proxy/make.js b/proxy/make.js
index aebc4f8..59165b2 100755
--- a/proxy/make.js
+++ b/proxy/make.js
@@ -32,7 +32,7 @@ var SHARED_FILES = [
   'embed.html',
   'embed.css',
   'popup.js',
-  'icons'
+  'assets'
 ];
 
 var concatJS = function(outDir, init, outFile) {
diff --git a/proxy/static/icons/arrowhead-right-12.svg b/proxy/static/assets/arrowhead-right-12.svg
similarity index 100%
rename from proxy/static/icons/arrowhead-right-12.svg
rename to proxy/static/assets/arrowhead-right-12.svg
diff --git a/proxy/static/icons/status-off.png b/proxy/static/assets/status-off.png
similarity index 100%
rename from proxy/static/icons/status-off.png
rename to proxy/static/assets/status-off.png
diff --git a/proxy/static/icons/status-off.svg b/proxy/static/assets/status-off.svg
similarity index 100%
rename from proxy/static/icons/status-off.svg
rename to proxy/static/assets/status-off.svg
diff --git a/proxy/static/icons/status-off@xxxxxx b/proxy/static/assets/status-off@xxxxxx
similarity index 100%
rename from proxy/static/icons/status-off@xxxxxx
rename to proxy/static/assets/status-off@xxxxxx
diff --git a/proxy/static/icons/status-off@xxxxxx b/proxy/static/assets/status-off@xxxxxx
similarity index 100%
rename from proxy/static/icons/status-off@xxxxxx
rename to proxy/static/assets/status-off@xxxxxx
diff --git a/proxy/static/icons/status-on.png b/proxy/static/assets/status-on.png
similarity index 100%
rename from proxy/static/icons/status-on.png
rename to proxy/static/assets/status-on.png
diff --git a/proxy/static/icons/status-on.svg b/proxy/static/assets/status-on.svg
similarity index 100%
rename from proxy/static/icons/status-on.svg
rename to proxy/static/assets/status-on.svg
diff --git a/proxy/static/icons/status-on@xxxxxx b/proxy/static/assets/status-on@xxxxxx
similarity index 100%
rename from proxy/static/icons/status-on@xxxxxx
rename to proxy/static/assets/status-on@xxxxxx
diff --git a/proxy/static/icons/status-on@xxxxxx b/proxy/static/assets/status-on@xxxxxx
similarity index 100%
rename from proxy/static/icons/status-on@xxxxxx
rename to proxy/static/assets/status-on@xxxxxx
diff --git a/proxy/static/icons/status-running.png b/proxy/static/assets/status-running.png
similarity index 100%
rename from proxy/static/icons/status-running.png
rename to proxy/static/assets/status-running.png
diff --git a/proxy/static/icons/status-running.svg b/proxy/static/assets/status-running.svg
similarity index 100%
rename from proxy/static/icons/status-running.svg
rename to proxy/static/assets/status-running.svg
diff --git a/proxy/static/embed.css b/proxy/static/embed.css
index e6d8149..990f7ec 100644
--- a/proxy/static/embed.css
+++ b/proxy/static/embed.css
@@ -27,7 +27,7 @@ body {
   display: block;
   position: absolute;
   top: 12px;
-  background-image: url('icons/arrowhead-right-12.svg');
+  background-image: url('assets/arrowhead-right-12.svg');
   width: 12px;
   height: 12px;
   opacity : 0.6;
diff --git a/proxy/static/embed.html b/proxy/static/embed.html
index a48daf3..176f4c3 100644
--- a/proxy/static/embed.html
+++ b/proxy/static/embed.html
@@ -10,7 +10,7 @@
   </head>
   <body>
     <div id="active">
-      <img src="icons/status-off.png" />
+      <img src="assets/status-off.png" />
       <p>Snowflake is off</p>
       <p></p>
     </div>
diff --git a/proxy/static/popup.js b/proxy/static/popup.js
index 0995775..5fd2142 100644
--- a/proxy/static/popup.js
+++ b/proxy/static/popup.js
@@ -7,7 +7,7 @@ class Popup {
     this.img = this.div.querySelector('img');
   }
   setImgSrc(src) {
-    this.img.src = `icons/status-${src}.png`;
+    this.img.src = `assets/status-${src}.png`;
   }
   setStatusText(txt) {
     this.ps[0].innerText = txt;
diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
index 3b96055..6b09376 100644
--- a/proxy/webext/manifest.json
+++ b/proxy/webext/manifest.json
@@ -9,7 +9,7 @@
   },
   "browser_action": {
     "default_icon": {
-      "32": "icons/status-on.png"
+      "32": "assets/status-on.png"
     },
     "default_title": "Snowflake",
     "default_popup": "embed.html"

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits