Merge pull request #39 from l-n-s/webui

removed yarn stuff and make del button less ugly
majestrate · Nov 2, 2017 · 8dd5956 · 8dd5956
2 parents 673925c + c44f53c
commit 8dd5956
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1,347 deletions.
diff --git a/contrib/webui/.yarnclean b/contrib/webui/.yarnclean
diff --git a/contrib/webui/Makefile b/contrib/webui/Makefile
@@ -12,7 +12,7 @@ build:
 	cat $(JS_ROOT)/*.js > $(JS)
 
 run:
-	yarn run server
+	node server.js
 
 clean:
 	rm -f $(CSS) $(JS)
diff --git a/contrib/webui/css/main.css b/contrib/webui/css/main.css
@@ -8,15 +8,17 @@ progress {
 }
 
 .button-remove {
-    background: red;
-    color: snow;
+    color: #222;
     font-weight: bold;
-    padding: 3px 5px;
-    border-radius: 10px;
+    padding: 0px 10px;
+    border-radius: 4px;
+    border:1px #bbb solid;
 }
+
 .button-remove:hover {
     cursor: pointer;
-    background: darkred;
+    background: crimson;
+    color: snow;
 }
 
 .torrent-row {

diff --git a/contrib/webui/docroot/index.html b/contrib/webui/docroot/index.html
@@ -22,7 +22,7 @@
                   <input class="u-full-width" type="text" 
                       placeholder="Torrent location (URL or local file)" 
                       data-bind="value: torrentURL"
-                      id="exampleEmailInput">
+                      id="torrent-url-input">
                 </div>
                 <div class="two columns">
                   <input class="u-full-width button-primary" type="submit" 
@@ -43,7 +43,7 @@
                       <div><span data-bind="text: $data.Peers()"></span> peers connected. <span data-bind="text: $data.Speed()"></span></div>
                   </div>
                   <div class="two columns torrent-buttons">
-                      <span class="button-remove" data-bind="click: remove" title="Remove torrent and delete files">X</span></div>
+                      <span class="button-remove" data-bind="click: remove" title="Remove torrent and delete files">&mdash;</span></div>
               </div>
           </div>
       </div>

diff --git a/contrib/webui/readme.md b/contrib/webui/readme.md
@@ -6,7 +6,6 @@ XD web ui source code
 ## dependencies
 
 * nodejs
-* yarn
 * GNU Make
 
 ## building

diff --git a/contrib/webui/webpack.config.js b/contrib/webui/webpack.config.js