From 7e5e858dadde9b8a0348e04949e259c650e88ee6 Mon Sep 17 00:00:00 2001 From: Damien Churchill Date: Mon, 13 Oct 2008 23:51:14 +0000 Subject: [PATCH] migrate all icons into the base css file, themes can override if need be --- .../ajax/static/themes/classic/style.css | 26 ----------------- .../ajax/static/themes/white/style.css | 24 --------------- .../webui/templates/ajax/template_style.css | 29 +++++++++++++++++++ 3 files changed, 29 insertions(+), 50 deletions(-) diff --git a/deluge/ui/webui/templates/ajax/static/themes/classic/style.css b/deluge/ui/webui/templates/ajax/static/themes/classic/style.css index ff18d144f..36f0ec8bb 100644 --- a/deluge/ui/webui/templates/ajax/static/themes/classic/style.css +++ b/deluge/ui/webui/templates/ajax/static/themes/classic/style.css @@ -86,32 +86,6 @@ body { background: url(split_horizontal.png) repeat-x; } -#toolbar #buttons #create {background-image:url(../../icons/32/new.png)} -#toolbar #buttons #add {background-image:url(../../icons/32/add.png)} -#toolbar #buttons #remove {background-image:url(../../icons/32/remove.png)} -#toolbar #buttons #pause {background-image:url(../../icons/32/pause.png)} -#toolbar #buttons #resume {background-image:url(../../icons/32/resume.png)} -#toolbar #buttons #up {background-image:url(../../icons/32/up.png)} -#toolbar #buttons #down {background-image:url(../../icons/32/down.png)} -#toolbar #buttons #preferences {background-image:url(../../icons/32/options.png)} -#toolbar #buttons #connections {background-image:url(../../icons/32/connections.png)} - -#status #info #connections {background-image:url(/static/images/tango/connections.png)} -#status #info #downspeed {background-image:url(/pixmaps/downloading16.png)} -#status #info #upspeed {background-image:url(/pixmaps/seeding16.png)} -#status #info #incoming_connections { background-image: url('/pixmaps/alert16.png'); } -#status #info #dht {background-image:url(/pixmaps/dht16.png)} -#status #info #free_space {background-image:url(/static/images/tango/drive-harddisk.png)} - -#labels .all { background-image: url('/pixmaps/dht16.png'); } -#labels .active { background-image: url('/pixmaps/active16.png'); } -#labels .downloading { background-image: url('/pixmaps/downloading16.png'); } -#labels .seeding { background-image: url('/pixmaps/seeding16.png'); } -#labels .queued { background-image: url('/pixmaps/queued16.png'); } -#labels .paused { background-image: url('/pixmaps/inactive16.png'); } -#labels .error { background-image: url('/pixmaps/alert16.png'); } -#labels .checking { background-image: url('/pixmaps/inactive16.png'); } - #labels { width: 140px; margin: 5px; diff --git a/deluge/ui/webui/templates/ajax/static/themes/white/style.css b/deluge/ui/webui/templates/ajax/static/themes/white/style.css index 0cef5d716..4ae48666d 100644 --- a/deluge/ui/webui/templates/ajax/static/themes/white/style.css +++ b/deluge/ui/webui/templates/ajax/static/themes/white/style.css @@ -78,30 +78,6 @@ body { background: none; } -#toolbar #buttons #add {background-image:url(/template/static/icons/32/add.png)} -#toolbar #buttons #remove {background-image:url(/template/static/icons/32/remove.png)} -#toolbar #buttons #pause {background-image:url(/template/static/icons/32/pause.png)} -#toolbar #buttons #resume {background-image:url(/template/static/icons/32/resume.png)} -#toolbar #buttons #up {background-image:url(/template/static/icons/32/up.png)} -#toolbar #buttons #down {background-image:url(/template/static/icons/32/down.png)} -#toolbar #buttons #preferences {background-image:url(/template/static/icons/32/options.png)} -#toolbar #buttons #connections {background-image:url(/template/static/icons/32/connections.png)} - -#status #info #connections {background-image:url(/static/images/tango/connections.png)} -#status #info #downspeed {background-image:url(/pixmaps/downloading16.png)} -#status #info #upspeed {background-image:url(/pixmaps/seeding16.png)} -#status #info #incoming_connections { background-image: url('/pixmaps/alert16.png'); } -#status #info #dht {background-image:url(/pixmaps/dht16.png)} -#status #info #free_space {background-image:url(/static/images/tango/drive-harddisk.png)} - -#labels .downloading { background-image: url('/pixmaps/downloading16.png'); } -#labels .seeding { background-image: url('/pixmaps/seeding16.png'); } -#labels .queued { background-image: url('/pixmaps/queued16.png'); } -#labels .paused { background-image: url('/pixmaps/inactive16.png'); } -#labels .error { background-image: url('/pixmaps/alert16.png'); } -#labels .checking { background-image: url('/pixmaps/inactive16.png'); } - - #labels { width: 160px; margin: 5px; diff --git a/deluge/ui/webui/templates/ajax/template_style.css b/deluge/ui/webui/templates/ajax/template_style.css index ce027fe8e..31b0b0eeb 100644 --- a/deluge/ui/webui/templates/ajax/template_style.css +++ b/deluge/ui/webui/templates/ajax/template_style.css @@ -39,6 +39,35 @@ html, body { font-size: 26px; } +/* The toolbar button icons */ +#toolbar #buttons #create {background-image:url(../../icons/32/new.png)} +#toolbar #buttons #add {background-image:url(../../icons/32/add.png)} +#toolbar #buttons #remove {background-image:url(../../icons/32/remove.png)} +#toolbar #buttons #pause {background-image:url(../../icons/32/pause.png)} +#toolbar #buttons #resume {background-image:url(../../icons/32/resume.png)} +#toolbar #buttons #up {background-image:url(../../icons/32/up.png)} +#toolbar #buttons #down {background-image:url(../../icons/32/down.png)} +#toolbar #buttons #preferences {background-image:url(../../icons/32/options.png)} +#toolbar #buttons #connections {background-image:url(../../icons/32/connections.png)} + +/* The icons for the filter states */ +#labels .all { background-image: url('/pixmaps/dht16.png'); } +#labels .active { background-image: url('/pixmaps/active16.png'); } +#labels .downloading { background-image: url('/pixmaps/downloading16.png'); } +#labels .seeding { background-image: url('/pixmaps/seeding16.png'); } +#labels .queued { background-image: url('/pixmaps/queued16.png'); } +#labels .paused { background-image: url('/pixmaps/inactive16.png'); } +#labels .error { background-image: url('/pixmaps/alert16.png'); } +#labels .checking { background-image: url('/pixmaps/checking16.png'); } + +/* The icons for the statusbar */ +#status #info #connections {background-image:url(/static/images/tango/connections.png)} +#status #info #downspeed {background-image:url(/pixmaps/downloading16.png)} +#status #info #upspeed {background-image:url(/pixmaps/seeding16.png)} +#status #info #incoming_connections { background-image: url('/pixmaps/alert16.png'); } +#status #info #dht {background-image:url(/pixmaps/dht16.png)} +#status #info #free_space {background-image:url(/static/images/tango/drive-harddisk.png)} + #details { padding: 5px; }