From ebe7b21a8cce3bb22a9b075c6db52ef462515f37 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 11 Jan 2015 14:48:53 -0800 Subject: [PATCH] New: Show number of episodes on season status badge --- src/UI/Cells/cells.less | 6 --- src/UI/Content/badges.less | 37 +++++++++++++++++++ src/UI/Content/theme.less | 1 + .../Series/Details/SeasonLayoutTemplate.hbs | 9 +++-- src/UI/Series/series.less | 2 +- 5 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 src/UI/Content/badges.less diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less index 82208d596..e23d2bf00 100644 --- a/src/UI/Cells/cells.less +++ b/src/UI/Cells/cells.less @@ -95,12 +95,6 @@ td.episode-status-cell, td.quality-cell, td.history-quality-cell, td.progress-ce font-size: 10px; } - .badge-inverse { - background-color: #eee; - border: 1px solid @badge-bg; - color: @badge-bg; - } - .progress { height : 10px; margin-top : 5px; diff --git a/src/UI/Content/badges.less b/src/UI/Content/badges.less new file mode 100644 index 000000000..68caf5c45 --- /dev/null +++ b/src/UI/Content/badges.less @@ -0,0 +1,37 @@ +@import "../Content/Bootstrap/variables"; + +.badge-inverse { + background-color: #eee; + border: 1px solid @badge-bg; + color: @badge-bg; +} + +.badge-primary { + .badge-variant(@label-primary-bg); +} + +.badge-success { + .badge-variant(@label-success-bg); +} + +.badge-info { + .badge-variant(@label-info-bg); +} + +.badge-warning { + .badge-variant(@label-warning-bg); +} + +.badge-danger { + .badge-variant(@label-danger-bg); +} + +.badge-variant(@color) { + background-color: @color; + &[href] { + &:hover, + &:focus { + background-color: darken(@color, 10%); + } + } +} \ No newline at end of file diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less index 74b25185b..10c2d5505 100644 --- a/src/UI/Content/theme.less +++ b/src/UI/Content/theme.less @@ -18,6 +18,7 @@ @import "utilities"; @import "../Hotkeys/hotkeys"; @import "../Shared/FileBrowser/filebrowser"; +@import "badges"; .main-region { @media (min-width : @screen-lg-min) { diff --git a/src/UI/Series/Details/SeasonLayoutTemplate.hbs b/src/UI/Series/Details/SeasonLayoutTemplate.hbs index 508d300a5..69a9f1a9c 100644 --- a/src/UI/Series/Details/SeasonLayoutTemplate.hbs +++ b/src/UI/Series/Details/SeasonLayoutTemplate.hbs @@ -8,17 +8,18 @@ Specials {{/if}} + {{#if_eq episodeCount compare=0}} {{#if monitored}} - +   {{else}} - +   {{/if}} {{else}} {{#if_eq percentOfEpisodes compare=100}} - + {{episodeFileCount}} / {{episodeCount}} {{else}} - + {{episodeFileCount}} / {{episodeCount}} {{/if_eq}} {{/if_eq}} diff --git a/src/UI/Series/series.less b/src/UI/Series/series.less index f92cf62be..550bcf404 100644 --- a/src/UI/Series/series.less +++ b/src/UI/Series/series.less @@ -372,7 +372,7 @@ } .season-status { - font-size : 16px; + font-size : 11px; vertical-align : middle !important; }