From f63869bcfaee4bfa862966fdea588bdf4d50d5c2 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Thu, 6 Jun 2013 22:15:07 -0700 Subject: [PATCH] I feel pretty, Oh, so pretty, I feel pretty and witty and gay! And I pity Any girl who isn't me today. --- UI/Content/base.less | 10 ++++------ UI/Content/menu.less | 9 +++++++++ UI/Content/theme.less | 2 +- UI/Series/Details/SeriesDetailsLayout.js | 14 ++++++++++++-- UI/Series/Details/SeriesDetailsTemplate.html | 7 +------ UI/Series/series.less | 10 ++++++++-- UI/Shared/Styles/card.less | 1 + 7 files changed, 36 insertions(+), 17 deletions(-) diff --git a/UI/Content/base.less b/UI/Content/base.less index 7fc5b7aa1..3ff7a2d46 100644 --- a/UI/Content/base.less +++ b/UI/Content/base.less @@ -25,6 +25,10 @@ } } +.backdrop .page { + background-color: transparent; +} + html { overflow: -moz-scrollbars-vertical; overflow-y: scroll; @@ -61,12 +65,6 @@ html { } } -#in-sub-nav { - ul { - margin: 0 0 80px 0; - } -} - #notification-region { pre { font-size: 12px; diff --git a/UI/Content/menu.less b/UI/Content/menu.less index be4ebd965..f268c0eb8 100644 --- a/UI/Content/menu.less +++ b/UI/Content/menu.less @@ -11,3 +11,12 @@ color: #b9b9b9; } + +#in-sub-nav { + margin-bottom: 80px; +} + +.backdrop #in-sub-nav { + background-color: #000000; + opacity: 0.85; +} diff --git a/UI/Content/theme.less b/UI/Content/theme.less index 2b9f88557..d1c4c9482 100644 --- a/UI/Content/theme.less +++ b/UI/Content/theme.less @@ -750,7 +750,7 @@ body h1, body h2, body h3, body h4, body h5, body h6 { #in-sub-nav { ul { text-align: center; - margin-bottom: 80px; + margin-bottom: 10px; } li { list-style-type: none; diff --git a/UI/Series/Details/SeriesDetailsLayout.js b/UI/Series/Details/SeriesDetailsLayout.js index 4fc077b4d..48fc5305f 100644 --- a/UI/Series/Details/SeriesDetailsLayout.js +++ b/UI/Series/Details/SeriesDetailsLayout.js @@ -1,5 +1,5 @@ "use strict"; -define(['app', 'Series/Details/SeasonCollectionView','Shared/LoadingView'], function () { +define(['app', 'Series/Details/SeasonCollectionView', 'Shared/LoadingView'], function () { NzbDrone.Series.Details.SeriesDetailsLayout = Backbone.Marionette.Layout.extend({ itemViewContainer: '.x-series-seasons', @@ -9,10 +9,19 @@ define(['app', 'Series/Details/SeasonCollectionView','Shared/LoadingView'], func seasons: '#seasons' }, - onShow: function () { + ui: { + header: '.x-header' + }, + initialize: function () { + $('body').addClass('backdrop'); + }, + + onShow: function () { var self = this; + $.backstretch(this.model.get('fanArt')); + this.seasons.show(new NzbDrone.Shared.LoadingView()); this.seasonCollection = new NzbDrone.Series.SeasonCollection(); @@ -30,6 +39,7 @@ define(['app', 'Series/Details/SeasonCollectionView','Shared/LoadingView'], func onClose: function () { $('.backstretch').remove(); + $('body').removeClass('backdrop'); } }); } diff --git a/UI/Series/Details/SeriesDetailsTemplate.html b/UI/Series/Details/SeriesDetailsTemplate.html index b51d5e7a1..05514ab24 100644 --- a/UI/Series/Details/SeriesDetailsTemplate.html +++ b/UI/Series/Details/SeriesDetailsTemplate.html @@ -1,10 +1,5 @@ 
-
- - - -
-
+

{{title}}

diff --git a/UI/Series/series.less b/UI/Series/series.less index fe412afa5..e693d42e5 100644 --- a/UI/Series/series.less +++ b/UI/Series/series.less @@ -18,14 +18,19 @@ } .series-page-header { - .card; - padding: 30px 0px; + background: #000000; + color: #ffffff; + opacity: 0.9; + padding: 30px 30px; + margin: 50px 10px; + opacity: 0.9; } .series-season { .card; margin: 80px 10px; padding: 20px 40px; + opacity: 0.9; } @@ -124,3 +129,4 @@ .series-detail-overview { margin-bottom: 50px; } + diff --git a/UI/Shared/Styles/card.less b/UI/Shared/Styles/card.less index 697dd166f..59191ae6a 100644 --- a/UI/Shared/Styles/card.less +++ b/UI/Shared/Styles/card.less @@ -1,5 +1,6 @@ .card { margin :10px; + background-color: #ffffff; padding: 10px; box-shadow: 0px 0px 10px 1px #e1e1e1; color: #444444;