From 942679d4bd0bc0d237c1b17bcca5d97a1db23964 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Tue, 4 Jun 2013 18:04:34 -0700 Subject: [PATCH] fixed card styling for import series --- UI/AddSeries/SearchResultTemplate.html | 4 ++-- UI/AddSeries/addSeries.less | 10 ++++++---- UI/Series/EpisodeModel.js | 11 +++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/UI/AddSeries/SearchResultTemplate.html b/UI/AddSeries/SearchResultTemplate.html index 6754cd4a5..5058a69f6 100644 --- a/UI/AddSeries/SearchResultTemplate.html +++ b/UI/AddSeries/SearchResultTemplate.html @@ -1,4 +1,4 @@ -
+ -
\ No newline at end of file + diff --git a/UI/AddSeries/addSeries.less b/UI/AddSeries/addSeries.less index b8954373a..a0f0f09ec 100644 --- a/UI/AddSeries/addSeries.less +++ b/UI/AddSeries/addSeries.less @@ -49,6 +49,7 @@ } .unmapped-folder-view { + .card; margin-top: 20px; padding: 20px; .folder-header { @@ -65,8 +66,6 @@ .search-item { - .card; - padding-bottom: 20px; a { color: #343434; @@ -79,6 +78,10 @@ } } +.search-item-new { + .card; +} + .new-series-overview { text-overflow: ellipsis; white-space: pre-line; @@ -91,10 +94,9 @@ } .new-series-loadmore { - .card; .clickable; font-size: 30px; font-weight: 300; padding-top: 10px; padding-bottom: 10px; -} \ No newline at end of file +} diff --git a/UI/Series/EpisodeModel.js b/UI/Series/EpisodeModel.js index a5b45d122..65e7822b8 100644 --- a/UI/Series/EpisodeModel.js +++ b/UI/Series/EpisodeModel.js @@ -24,11 +24,14 @@ define(['app'], function () { return start.format('{h}.{mm}{tt}'); }, - end : function () { - var start = Date.create(this.get('airDate')); - var runtime = this.get('series').runtime; + end : function () { - return start.addMinutes(runtime); + if (this.has('series')) { + var start = Date.create(this.get('airDate')); + var runtime = this.get('series').runtime; + + return start.addMinutes(runtime); + } }, statusLevel : function () { var episodeFileId = this.get('episodeFileId');