diff --git a/CHANGES.md b/CHANGES.md
index 3e28eeaa..0a1bbdb6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -49,6 +49,7 @@
* Change log rotation to occur at midnight
* Change to keep a maximum of 7 log files
* Add automatic compression of old log files
+* Change overhaul menu and button icons
[develop changelog]
* Fix traceback error when using the menu item Manage/Update Kodi
diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css
index e1253155..0d31fc5e 100644
--- a/gui/slick/css/dark.css
+++ b/gui/slick/css/dark.css
@@ -11,11 +11,6 @@ inc_top.tmpl
background-image: url("../images/glyphicons-halflings-white.png");
}
-.dropdown-menu li > a:hover > [class^="menu-icon-"],
-.dropdown-menu li > a:hover > [class*=" menu-icon-"] {
- background-image: url("../images/menu/menu-icons-white.png");
-}
-
.infoTableHeader .icon16-sb {
background: url("../images/ico/favicon-16x16.png") 0 0 no-repeat;
}
@@ -196,160 +191,6 @@ inc_top.tmpl
margin-bottom: 0;
}
-[class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-white.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
-}
-
-@media(max-width:767px){
- [class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-white.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
- }
-}
-
-.menu-icon-addshow {
- background-position: 0 0;
-}
-
-.menu-icon-anime {
- background-position: -21px 0;
-}
-
-.menu-icon-backlog-view {
- background-position: -42px 0;
-}
-
-.menu-icon-backlog {
- background-position: -63px 0;
-}
-
-.menu-icon-bittorrent {
- background-position: -84px 0;
-}
-
-.menu-icon-config-index {
- background-position: -105px 0;
-}
-
-.menu-icon-config {
- background-position: -126px 0;
-}
-
-.menu-icon-failed-download {
- background-position: -147px 0;
-}
-
-.menu-icon-home {
- background-position: -168px 0;
-}
-
-.menu-icon-manage {
- background-position: -189px 0;
-}
-
-.menu-icon-manage-searches {
- background-position: -210px 0;
-}
-
-.menu-icon-poster {
- background-position: -231px 0;
-}
-
-.menu-icon-postprocess {
- background-position: -252px 0;
-}
-
-.menu-icon-restart {
- background-position: -273px 0;
-}
-
-.menu-icon-shutdown {
- background-position: -294px 0;
-}
-
-.menu-icon-update {
- background-position: -315px 0;
-}
-
-.menu-icon-viewlog-errors {
- background-position: -336px 0;
-}
-
-.menu-icon-viewlog {
- background-position: -357px 0;
-}
-
-.menu-icon-xbmc {
- background-position: -378px 0;
-}
-
-.menu-icon-help {
- background-position: -399px 0;
-}
-
-.menu-icon-logout {
- background-position: -420px 0;
-}
-
-.menu-icon-kodi {
- background-position: -441px 0;
-}
-
-.menu-icon-plex {
- background-position: -462px 0;
-}
-
-[class^="submenu-icon-"], [class*=" submenu-icon-"] {
- background: url("../images/menu/menu-icons-white.png");
- height: 16px;
- width: 16px;
-}
-
-.submenu-icon-anime {
- background-position: -21px 0;
-}
-
-.submenu-icon-bittorrent {
- background-position: -84px 0;
-}
-
-.submenu-icon-failed-download {
- background-position: -147px 0;
-}
-
-.submenu-icon-restart {
- background-position: -273px 0;
-}
-
-.submenu-icon-shutdown {
- background-position: -294px 0;
-}
-
-.submenu-icon-xbmc {
- background-position: -378px 0;
-}
-
-.submenu-icon-kodi {
- background-position: -441px 0;
-}
-
-.submenu-icon-plex {
- background-position: -462px -2px;
- margin-top: 2px;
- height: 12px;
-}
-
/* =======================================================================
inc_bottom.tmpl
========================================================================== */
diff --git a/gui/slick/css/fonts/droidsansmono-webfont.eot b/gui/slick/css/fonts/droidsansmono-webfont.eot
deleted file mode 100644
index aca857ba..00000000
Binary files a/gui/slick/css/fonts/droidsansmono-webfont.eot and /dev/null differ
diff --git a/gui/slick/css/fonts/droidsansmono-webfont.svg b/gui/slick/css/fonts/droidsansmono-webfont.svg
deleted file mode 100644
index 584c09ec..00000000
--- a/gui/slick/css/fonts/droidsansmono-webfont.svg
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/gui/slick/css/fonts/droidsansmono-webfont.ttf b/gui/slick/css/fonts/droidsansmono-webfont.ttf
deleted file mode 100644
index 1e576a8b..00000000
Binary files a/gui/slick/css/fonts/droidsansmono-webfont.ttf and /dev/null differ
diff --git a/gui/slick/css/fonts/droidsansmono-webfont.woff b/gui/slick/css/fonts/droidsansmono-webfont.woff
deleted file mode 100644
index ef6964d2..00000000
Binary files a/gui/slick/css/fonts/droidsansmono-webfont.woff and /dev/null differ
diff --git a/gui/slick/css/fonts/sgicons.eot b/gui/slick/css/fonts/sgicons.eot
new file mode 100644
index 00000000..7e046292
Binary files /dev/null and b/gui/slick/css/fonts/sgicons.eot differ
diff --git a/gui/slick/css/fonts/sgicons.svg b/gui/slick/css/fonts/sgicons.svg
new file mode 100644
index 00000000..c3a6f563
--- /dev/null
+++ b/gui/slick/css/fonts/sgicons.svg
@@ -0,0 +1,45 @@
+
+
+
\ No newline at end of file
diff --git a/gui/slick/css/fonts/sgicons.ttf b/gui/slick/css/fonts/sgicons.ttf
new file mode 100644
index 00000000..595bb99e
Binary files /dev/null and b/gui/slick/css/fonts/sgicons.ttf differ
diff --git a/gui/slick/css/fonts/sgicons.woff b/gui/slick/css/fonts/sgicons.woff
new file mode 100644
index 00000000..cf791cac
Binary files /dev/null and b/gui/slick/css/fonts/sgicons.woff differ
diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css
index 89851c03..242ba152 100644
--- a/gui/slick/css/light.css
+++ b/gui/slick/css/light.css
@@ -11,11 +11,6 @@ inc_top.tmpl
background-image: url("../images/glyphicons-halflings-white.png");
}
-.dropdown-menu li > a:hover > [class^="menu-icon-"],
-.dropdown-menu li > a:hover > [class*=" menu-icon-"] {
- background-image: url("../images/menu/menu-icons-white.png");
-}
-
.ui-autocomplete-loading {
background: white url("../images/loading16.gif") right center no-repeat;
}
@@ -183,160 +178,6 @@ inc_top.tmpl
margin-bottom: 0;
}
-[class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-black.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
-}
-
-@media(max-width:767px){
- [class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-white.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
- }
-}
-
-.menu-icon-addshow {
- background-position: 0 0;
-}
-
-.menu-icon-anime {
- background-position: -21px 0;
-}
-
-.menu-icon-backlog-view {
- background-position: -42px 0;
-}
-
-.menu-icon-backlog {
- background-position: -63px 0;
-}
-
-.menu-icon-bittorrent {
- background-position: -84px 0;
-}
-
-.menu-icon-config-index {
- background-position: -105px 0;
-}
-
-.menu-icon-config {
- background-position: -126px 0;
-}
-
-.menu-icon-failed-download {
- background-position: -147px 0;
-}
-
-.menu-icon-home {
- background-position: -168px 0;
-}
-
-.menu-icon-manage {
- background-position: -189px 0;
-}
-
-.menu-icon-manage-searches {
- background-position: -210px 0;
-}
-
-.menu-icon-poster {
- background-position: -231px 0;
-}
-
-.menu-icon-postprocess {
- background-position: -252px 0;
-}
-
-.menu-icon-restart {
- background-position: -273px 0;
-}
-
-.menu-icon-shutdown {
- background-position: -294px 0;
-}
-
-.menu-icon-update {
- background-position: -315px 0;
-}
-
-.menu-icon-viewlog-errors {
- background-position: -336px 0;
-}
-
-.menu-icon-viewlog {
- background-position: -357px 0;
-}
-
-.menu-icon-xbmc {
- background-position: -378px 0;
-}
-
-.menu-icon-help {
- background-position: -399px 0;
-}
-
-.menu-icon-logout {
- background-position: -420px 0;
-}
-
-.menu-icon-kodi {
- background-position: -441px 0;
-}
-
-.menu-icon-plex {
- background-position: -462px 0;
-}
-
-[class^="submenu-icon-"], [class*=" submenu-icon-"] {
- background: url("../images/menu/menu-icons-black.png");
- height: 16px;
- width: 16px;
-}
-
-.submenu-icon-anime {
- background-position: -21px 0;
-}
-
-.submenu-icon-bittorrent {
- background-position: -84px 0;
-}
-
-.submenu-icon-failed-download {
- background-position: -147px 0;
-}
-
-.submenu-icon-restart {
- background-position: -273px 0;
-}
-
-.submenu-icon-shutdown {
- background-position: -294px 0;
-}
-
-.submenu-icon-xbmc {
- background-position: -378px 0;
-}
-
-.submenu-icon-kodi {
- background-position: -441px 0;
-}
-
-.submenu-icon-plex {
- background-position: -462px -2px;
- margin-top: 2px;
- height: 12px;
-}
-
/* =======================================================================
inc_bottom.tmpl
========================================================================== */
diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css
index f9e9f8a8..fc500914 100644
--- a/gui/slick/css/style.css
+++ b/gui/slick/css/style.css
@@ -127,14 +127,14 @@ fonts
font-style: italic;
}
-/* Droid Sans */
+/* SickGear Icons */
@font-face {
- font-family: 'droid_sans_mono';
- src:url('fonts/droidsansmono-webfont.eot');
- src:url('fonts/droidsansmono-webfont.eot?#iefix') format('embedded-opentype'),
- url('fonts/droidsansmono-webfont.woff') format('woff'),
- url('fonts/droidsansmono-webfont.ttf') format('truetype'),
- url('fonts/droidsansmono-webfont.svg#droid_sans_monoregular') format('svg');
+ font-family: 'sgicons';
+ src:url('fonts/sgicons.eot');
+ src:url('fonts/sgicons.eot?#iefix') format('embedded-opentype'),
+ url('fonts/sgicons.woff') format('woff'),
+ url('fonts/sgicons.ttf') format('truetype'),
+ url('fonts/sgicons.svg#sgicons') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -164,11 +164,6 @@ inc_top.tmpl
background-image: url("../images/glyphicons-halflings-white.png");
}
-.dropdown-menu li > a:hover > [class^="menu-icon-"],
-.dropdown-menu li > a:hover > [class*=" menu-icon-"] {
- background-image: url("../images/menu/menu-icons-white.png");
-}
-
.ui-autocomplete-loading {
background: white url("../images/loading16.gif") right center no-repeat;
}
@@ -341,156 +336,158 @@ inc_top.tmpl
margin-bottom: 0;
}
-[class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-black.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
+[class^="sgicon-"], [class*=" sgicon-"] {
+ font-family: 'sgicons';
+ speak: none;
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+ text-shadow: none;
+ text-transform: none;
+ text-rendering: auto;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
}
-@media(max-width:767px){
- [class^="menu-icon-"], [class*=" menu-icon-"] {
- background: url("../images/menu/menu-icons-white.png");
- height: 16px;
- width: 16px;
- display: inline-block;
- position: relative;
- top: 2px;
- float: left;
- }
+.sgicon-rss:before {
+ content: "\e622";
}
-.menu-icon-addshow {
- background-position: 0 0;
+.sgicon-pause:before {
+ content: "\e600";
}
-.menu-icon-anime {
- background-position: -21px 0;
+.sgicon-play:before {
+ content: "\e601";
}
-.menu-icon-backlog-view {
- background-position: -42px 0;
+.sgicon-queued:before {
+ content: "\e602";
}
-.menu-icon-backlog {
- background-position: -63px 0;
+.sgicon-trim:before {
+ content: "\e603";
}
-.menu-icon-bittorrent {
- background-position: -84px 0;
+.sgicon-backlog:before {
+ content: "\e604";
}
-.menu-icon-config-index {
- background-position: -105px 0;
+.sgicon-home:before {
+ content: "\e605";
}
-.menu-icon-config {
- background-position: -126px 0;
+.sgicon-delete:before {
+ content: "\e606";
}
-.menu-icon-failed-download {
- background-position: -147px 0;
+.sgicon-errorlog:before {
+ content: "\e607";
}
-.menu-icon-home {
- background-position: -168px 0;
+.sgicon-log:before {
+ content: "\e608";
}
-.menu-icon-manage {
- background-position: -189px 0;
+.sgicon-notification:before {
+ content: "\e609";
}
-.menu-icon-manage-searches {
- background-position: -210px 0;
+.sgicon-postprocess:before {
+ content: "\e60a";
}
-.menu-icon-poster {
- background-position: -231px 0;
+.sgicon-failed:before {
+ content: "\e60b";
}
-.menu-icon-postprocess {
- background-position: -252px 0;
+.sgicon-updatecheck:before {
+ content: "\e60c";
}
-.menu-icon-restart {
- background-position: -273px 0;
+.sgicon-subtitles:before {
+ content: "\e60d";
}
-.menu-icon-shutdown {
- background-position: -294px 0;
+.sgicon-episodestatus:before {
+ content: "\e60e";
}
-.menu-icon-update {
- background-position: -315px 0;
+.sgicon-anime:before {
+ content: "\e60f";
}
-.menu-icon-viewlog-errors {
- background-position: -336px 0;
+.sgicon-logout:before {
+ content: "\e610";
}
-.menu-icon-viewlog {
- background-position: -357px 0;
+.sgicon-edit:before {
+ content: "\e611";
}
-.menu-icon-xbmc {
- background-position: -378px 0;
+.sgicon-rename:before {
+ content: "\e612";
}
-.menu-icon-help {
- background-position: -399px 0;
+.sgicon-fullupdate:before {
+ content: "\e613";
}
-.menu-icon-logout {
- background-position: -420px 0;
+.sgicon-refresh:before {
+ content: "\e614";
}
-.menu-icon-kodi {
- background-position: -441px 0;
+.sgicon-massupdate:before {
+ content: "\e615";
}
-.menu-icon-plex {
- background-position: -462px 0;
+.sgicon-search:before {
+ content: "\e616";
}
-[class^="submenu-icon-"], [class*=" submenu-icon-"] {
- background: url("../images/menu/menu-icons-black.png");
- height: 16px;
- width: 16px;
+.sgicon-info:before {
+ content: "\e617";
}
-.submenu-icon-anime {
- background-position: -21px 0;
+.sgicon-restart:before {
+ content: "\e618";
}
-.submenu-icon-bittorrent {
- background-position: -84px 0;
+.sgicon-shutdown:before {
+ content: "\e619";
}
-.submenu-icon-failed-download {
- background-position: -147px 0;
+.sgicon-addshow:before {
+ content: "\e61a";
}
-.submenu-icon-restart {
- background-position: -273px 0;
+.sgicon-config:before {
+ content: "\e61b";
}
-.submenu-icon-shutdown {
- background-position: -294px 0;
+.sgicon-arrowup:before {
+ content: "\e61c";
}
-.submenu-icon-xbmc {
- background-position: -378px 0;
+.sgicon-arrowdown:before {
+ content: "\e61d";
}
-.submenu-icon-kodi {
- background-position: -441px 0;
+.sgicon-plex:before {
+ content: "\e61e";
}
-.submenu-icon-plex {
- background-position: -462px 0;
+.sgicon-kodi:before {
+ content: "\e61f";
+}
+
+.sgicon-bittorrent:before {
+ content: "\e620";
+}
+
+.sgicon-xbmc:before {
+ content: "\e621";
}
/* =======================================================================
diff --git a/gui/slick/images/menu/menu-icons-black.png b/gui/slick/images/menu/menu-icons-black.png
deleted file mode 100644
index 43dd426c..00000000
Binary files a/gui/slick/images/menu/menu-icons-black.png and /dev/null differ
diff --git a/gui/slick/images/menu/menu-icons-white.png b/gui/slick/images/menu/menu-icons-white.png
deleted file mode 100644
index 0d867eca..00000000
Binary files a/gui/slick/images/menu/menu-icons-white.png and /dev/null differ
diff --git a/gui/slick/interfaces/default/config_postProcessing.tmpl b/gui/slick/interfaces/default/config_postProcessing.tmpl
index e4bf8ca4..a019260e 100644
--- a/gui/slick/interfaces/default/config_postProcessing.tmpl
+++ b/gui/slick/interfaces/default/config_postProcessing.tmpl
@@ -436,17 +436,17 @@
| 720p_BluRay |
- | Release Name: |
+ Release Name: |
%RN |
Show.Name.S02E03.HDTV.XviD-RLSGROUP |
- | Release Group: |
+ Release Group: |
-%RG |
RLSGROUP |
- | Release Type: |
+ Release Type: |
%RT |
PROPER |
@@ -661,17 +661,17 @@
09 |
- | Release Name: |
+ Release Name: |
%RN |
Show.Name.2010.03.09.HDTV.XviD-RLSGROUP |
- | Release Group: |
+ Release Group: |
-%RG |
RLSGROUP |
- | Release Type: |
+ Release Type: |
%RT |
PROPER |
@@ -859,17 +859,17 @@
09 |
- | Release Name: |
+ Release Name: |
%RN |
Show.Name.9th.Mar.2011.HDTV.XviD-RLSGROUP |
- | Release Group: |
+ Release Group: |
-%RG |
RLSGROUP |
- | Release Type: |
+ Release Type: |
%RT |
PROPER |
@@ -1057,17 +1057,17 @@
720p_BluRay |
- | Release Name: |
+ Release Name: |
%RN |
Show.Name.S02E03.HDTV.XviD-RLSGROUP |
- | Release Group: |
+ Release Group: |
[%RG] |
RLSGROUP |
- | Release Type: |
+ Release Type: |
%RT |
PROPER |
diff --git a/gui/slick/interfaces/default/episodeView.tmpl b/gui/slick/interfaces/default/episodeView.tmpl
index 7203631d..ebceb489 100644
--- a/gui/slick/interfaces/default/episodeView.tmpl
+++ b/gui/slick/interfaces/default/episodeView.tmpl
@@ -191,7 +191,7 @@
Distant
#end if
- Subscribe
+ Subscribe
diff --git a/gui/slick/interfaces/default/inc_top.tmpl b/gui/slick/interfaces/default/inc_top.tmpl
index ad4b6cbb..bd0c0e44 100644
--- a/gui/slick/interfaces/default/inc_top.tmpl
+++ b/gui/slick/interfaces/default/inc_top.tmpl
@@ -81,37 +81,37 @@