css: move icons out to their own stylesheet

3 files changed, 114 insertions, 129 deletions

diff --git a/deluge/ui/web/css/deluge.css b/deluge/ui/web/css/deluge.css
index 8e2a07cfe..0af5e2549 100644
--- a/deluge/ui/web/css/deluge.css
+++ b/deluge/ui/web/css/deluge.css
@@ -59,7 +59,7 @@ input {
 
 .deluge-torrents td, .x-deluge-peers td {
 	height: 16px;
-    line-height: 16px;
+    line-height: 16px !important;
 }
 
 .deluge-torrents .torrent-name, .x-deluge-peer, .x-deluge-seed {
@@ -309,130 +309,3 @@ dl.singleline dd {
 .x-mixed-download {
 	/*background-image: url(../icons/mixed.png);*/
 }
-
-/**
- * Deluge Default Icon Set
- * n.b. this needs to be forked out at some point
- */
-
-.icon-create {
-	background-image: url('../icons/create.png') !important;
-}
-
-.icon-add {
-	background-image: url('../icons/add.png') !important;
-}
-
-.icon-add-url {
-	background-image: url('../icons/add_url.png') !important;
-}
-
-.icon-add-magnet {
-	background-image: url('../icons/add_magnet.png') !important;
-}
-
-
-
-.icon-pause {
-	background-image: url('../icons/pause.png') !important;
-}
-
-.icon-resume {
-	background-image: url('../icons/start.png') !important;
-}
-
-.icon-options {
-	background-image: url('../icons/preferences.png') !important;
-}
-
-.icon-queue {
-	background-image: url('../icons/queue.png') !important;
-}
-
-.icon-top {
-	background-image: url('../icons/top.png') !important;
-}
-
-.icon-up {
-	background-image: url('../icons/up.png') !important;
-}
-
-.icon-down {
-	background-image: url('../icons/down.png') !important;
-}
-
-.icon-bottom {
-	background-image: url('../icons/bottom.png') !important;
-}
-
-.icon-update-tracker {
-	background-image: url('../icons/update.png') !important;
-}
-
-.icon-edit-trackers, .icon-edit {
-	background-image: url('../icons/edit_trackers.png') !important;
-}
-
-.icon-remove {
-	background-image: url('../icons/remove.png') !important;
-}
-
-.icon-recheck {
-	background-image: url('../icons/recheck.png') !important;
-}
-
-.icon-move {
-	background-image: url('../icons/move.png') !important;
-}
-
-.icon-help {
-	background-image: url('../icons/help.png') !important;
-}
-
-.icon-logout {
-	background-image: url('../icons/logout.png') !important;
-}
-
-.icon-back {
-	background-image: url('../icons/back.png') !important;
-}
-
-.icon-forward {
-	background-image: url('../icons/forward.png') !important;
-}
-
-.icon-home {
-	background-image: url('../icons/home.png') !important;
-}
-
-.icon-ok {
-	background-image: url('../icons/ok.png') !important;
-}
-
-.icon-error {
-	background-image: url('../icons/error.png') !important;
-}
-
-.icon-upload-slots {
-	background-image: url('../icons/upload_slots.png') !important;
-}
-
-.icon-expand-all {
-	background-image: url('../icons/expand_all.png') !important;
-}
-
-.icon-do-not-download {
-	background-image: url('../icons/no_download.png') !important;
-}
-
-.icon-normal {
-	background-image: url('../icons/normal.png') !important;
-}
-
-.icon-high {
-	background-image: url('../icons/high.png') !important;
-}
-
-.icon-highest {
-	background-image: url('../icons/highest.png') !important;
-}
diff --git a/deluge/ui/web/css/icons.css b/deluge/ui/web/css/icons.css
new file mode 100644
index 000000000..caf32f8cf
--- /dev/null
+++ b/deluge/ui/web/css/icons.css
@@ -0,0 +1,111 @@
+.icon-create {
+    background-image: url('../icons/create.png') !important;
+}
+
+.icon-add {
+    background-image: url('../icons/add.png') !important;
+}
+
+.icon-add-url {
+    background-image: url('../icons/add_url.png') !important;
+}
+
+.icon-add-magnet {
+    background-image: url('../icons/add_magnet.png') !important;
+}
+
+.icon-options {
+    background-image: url('../icons/preferences.png') !important;
+}
+
+.icon-queue {
+    background-image: url('../icons/queue.png') !important;
+}
+
+.icon-top {
+    background-image: url('../icons/top.png') !important;
+}
+
+.icon-up {
+    background-image: url('../icons/up.png') !important;
+}
+
+.icon-down {
+    background-image: url('../icons/down.png') !important;
+}
+
+.icon-bottom {
+    background-image: url('../icons/bottom.png') !important;
+}
+
+.icon-update-tracker {
+    background-image: url('../icons/update.png') !important;
+}
+
+.icon-edit-trackers, .icon-edit {
+    background-image: url('../icons/edit_trackers.png') !important;
+}
+
+.icon-remove {
+    background-image: url('../icons/remove.png') !important;
+}
+
+.icon-recheck {
+    background-image: url('../icons/recheck.png') !important;
+}
+
+.icon-move {
+    background-image: url('../icons/move.png') !important;
+}
+
+.icon-help {
+    background-image: url('../icons/help.png') !important;
+}
+
+.icon-logout {
+    background-image: url('../icons/logout.png') !important;
+}
+
+.icon-back {
+    background-image: url('../icons/back.png') !important;
+}
+
+.icon-forward {
+    background-image: url('../icons/forward.png') !important;
+}
+
+.icon-home {
+    background-image: url('../icons/home.png') !important;
+}
+
+.icon-ok {
+    background-image: url('../icons/ok.png') !important;
+}
+
+.icon-error {
+    background-image: url('../icons/error.png') !important;
+}
+
+.icon-upload-slots {
+    background-image: url('../icons/upload_slots.png') !important;
+}
+
+.icon-expand-all {
+    background-image: url('../icons/expand_all.png') !important;
+}
+
+.icon-do-not-download {
+    background-image: url('../icons/no_download.png') !important;
+}
+
+.icon-normal {
+    background-image: url('../icons/normal.png') !important;
+}
+
+.icon-high {
+    background-image: url('../icons/high.png') !important;
+}
+
+.icon-highest {
+    background-image: url('../icons/highest.png') !important;
+}
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index c1fad6745..01e4ea6ba 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -534,7 +534,8 @@ class TopLevel(Resource):
     __stylesheets = [
         "resources/css/ext-all-gray.css",
 #        "css/ext-extensions.css",
-        "css/deluge.css"
+        "css/deluge.css",
+        "css/icons.css"
     ]
 
     def __init__(self):