From 99f2b07a115bb4ca2b2ce0a76baf38d66a6c5cef Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 4 May 2014 00:11:43 -0700 Subject: [PATCH] Bootstrap 3 New: Updated UI New: Mobile browser support Fixed: /favicon.ico will return the favicon now --- Gruntfile.js | 8 +- .../Frontend/Mappers/FaviconMapper.cs | 30 +++ .../Frontend/Mappers/StaticResourceMapper.cs | 3 +- src/NzbDrone.Api/NzbDrone.Api.csproj | 1 + .../PageModel/PageBase.cs | 13 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 1 + src/UI/AddSeries/AddSeriesLayoutTemplate.html | 32 +-- src/UI/AddSeries/AddSeriesViewTemplate.html | 11 +- .../RootFolders/RootFolderLayoutTemplate.html | 14 +- .../RootFolderSelectionPartial.html | 23 +- .../StartingSeasonSelectionPartial.html | 2 +- .../AddSeries/SearchResultViewTemplate.html | 72 +++--- src/UI/AddSeries/addSeries.less | 44 +--- src/UI/Calendar/CalendarFeedViewTemplate.html | 46 ++-- src/UI/Calendar/CalendarLayoutTemplate.html | 4 +- src/UI/Calendar/CalendarView.js | 79 ++++-- src/UI/Cells/EpisodeActionsCellTemplate.html | 6 +- src/UI/Cells/SeriesActionsCell.js | 4 +- src/UI/Cells/cells.less | 13 +- src/UI/Content/Backgrid/paginator.less | 4 + src/UI/Content/Images/logos/128.png | Bin 0 -> 7233 bytes src/UI/Content/Images/logos/32.png | Bin 0 -> 1631 bytes src/UI/Content/Images/logos/48.png | Bin 0 -> 2547 bytes .../Content/Images/{logo.png => logos/64.png} | Bin src/UI/Content/Messenger/messenger.css | 47 ++-- ...essenger.future.css => messenger.flat.css} | 180 ++++++-------- src/UI/Content/Overrides/bootstrap.less | 90 ++++--- .../Overrides/bootstrap.toggle-switch.less | 3 + src/UI/Content/Overrides/fullcalendar.less | 12 +- src/UI/Content/Overrides/messenger.less | 18 ++ src/UI/Content/bootstrap.less | 2 + src/UI/Content/form.less | 45 +++- src/UI/Content/menu.less | 161 ------------- src/UI/Content/navbar.less | 227 ++++++++++++++++++ src/UI/Content/progress-bars.less | 9 +- src/UI/Content/theme.less | 33 ++- src/UI/Content/typeahead.less | 152 ++++++++++++ src/UI/Content/utilities.less | 19 ++ .../EpisodeActivityLayoutTemplate.html | 2 +- .../Episode/EpisodeDetailsLayoutTemplate.html | 58 ++--- .../Episode/Search/ManualLayoutTemplate.html | 2 +- src/UI/Form/CheckboxTemplate.html | 32 +-- src/UI/Form/FormHelpPartial.html | 15 +- src/UI/Form/PasswordTemplate.html | 12 +- src/UI/Form/PathTemplate.html | 12 +- src/UI/Form/SelectTemplate.html | 12 +- src/UI/Form/TextboxTemplate.html | 8 +- src/UI/Handlebars/Helpers/Episode.js | 12 + src/UI/Handlebars/Helpers/Quality.js | 2 +- src/UI/Health/HealthView.js | 6 +- .../Blacklist/BlacklistLayoutTemplate.html | 2 +- .../Details/HistoryDetailsViewTemplate.html | 149 ++++++------ src/UI/History/Queue/QueueLayoutTemplate.html | 2 +- src/UI/History/Table/HistoryTableLayout.js | 4 +- .../Table/HistoryTableLayoutTemplate.html | 2 +- src/UI/JsLibraries/messenger.js | 69 ++++-- src/UI/Mixins/AsFilteredCollection.js | 8 +- src/UI/Mixins/AutoComplete.js | 42 +++- src/UI/Navbar/NavbarLayoutTemplate.html | 119 ++++----- src/UI/Navbar/NavbarView.js | 7 +- src/UI/Navbar/Search.js | 40 ++- .../QualityProfileSelectionPartial.html | 2 +- .../Rename/RenamePreviewLayoutTemplate.html | 49 ++-- .../Series/Delete/DeleteSeriesTemplate.html | 68 +++--- src/UI/Series/Details/InfoViewTemplate.html | 59 ++--- .../Series/Details/SeasonLayoutTemplate.html | 2 +- .../Series/Details/SeriesDetailsTemplate.html | 6 +- src/UI/Series/Edit/EditSeriesView.js | 1 - .../Series/Edit/EditSeriesViewTemplate.html | 138 +++++------ .../Organize/OrganizeFilesViewTemplate.html | 44 ++-- .../SeriesEditorFooterViewTemplate.html | 55 +++-- .../Editor/SeriesEditorLayoutTemplate.html | 2 +- .../Series/Index/EpisodeProgressPartial.html | 15 +- .../SeriesOverviewItemViewTemplate.html | 22 +- .../SeriesPostersItemViewTemplate.html | 4 +- src/UI/Series/Index/SeriesIndexLayout.js | 1 + .../Index/SeriesIndexLayoutTemplate.html | 2 +- src/UI/Series/series.less | 73 ++++-- ...wnloadClientAddCollectionViewTemplate.html | 24 +- .../DownloadClientAddItemViewTemplate.html | 14 +- .../DownloadClientDeleteViewTemplate.html | 24 +- .../DownloadClientCollectionViewTemplate.html | 2 +- .../DownloadClient/DownloadClientItemView.js | 13 +- .../DownloadClientItemViewTemplate.html | 8 +- .../Edit/DownloadClientEditViewTemplate.html | 104 ++++---- .../FailedDownloadHandlingViewTemplate.html | 128 +++++----- .../DownloadClientOptionsViewTemplate.html | 32 +-- .../DownloadClient/downloadclient.less | 16 +- .../Settings/General/GeneralViewTemplate.html | 191 ++++++++------- .../Settings/Indexers/DeleteViewTemplate.html | 24 +- src/UI/Settings/Indexers/EditTemplate.html | 102 ++++---- src/UI/Settings/Indexers/ItemTemplate.html | 2 +- .../Options/IndexerOptionsViewTemplate.html | 35 ++- src/UI/Settings/Indexers/indexers.less | 19 +- .../FileManagementViewTemplate.html | 94 ++++---- .../Naming/Basic/BasicNamingViewTemplate.html | 102 ++++---- .../Naming/NamingViewTemplate.html | 149 ++++++------ .../Permissions/PermissionsViewTemplate.html | 92 +++---- .../Sorting/SortingViewTemplate.html | 58 ++--- .../Metadata/MetadataEditViewTemplate.html | 66 ++--- .../Metadata/MetadataItemViewTemplate.html | 2 +- src/UI/Settings/Metadata/metadata.less | 2 +- .../Notifications/AddItemTemplate.html | 14 +- .../Settings/Notifications/AddTemplate.html | 24 +- .../Settings/Notifications/CollectionView.js | 2 +- .../Notifications/DeleteTemplate.html | 24 +- .../Settings/Notifications/ItemTemplate.html | 23 -- .../Notifications/NotificationEditView.js | 3 +- .../NotificationEditViewTemplate.html | 202 ++++++++-------- .../NotificationItemViewTemplate.html | 19 ++ .../{ItemView.js => NotificationsItemView.js} | 15 +- .../Settings/Notifications/notifications.less | 25 +- .../QualityDefinitionCollectionTemplate.html | 8 +- .../Definition/QualityDefinitionTemplate.html | 8 +- .../Definition/QualityDefinitionView.js | 8 +- .../Quality/Profile/AllowedLabeler.js | 4 +- ...eteView.js => DeleteQualityProfileView.js} | 2 +- .../DeleteQualityProfileViewTemplate.html | 15 ++ .../Quality/Profile/DeleteTemplate.html | 11 - .../Profile/Edit/EditQualityProfileLayout.js | 48 +++- .../EditQualityProfileLayoutTemplate.html | 56 +++-- .../Edit/EditQualityProfileViewTemplate.html | 20 +- .../Quality/Profile/QualityProfileView.js | 37 +-- .../Profile/QualityProfileViewTemplate.html | 10 +- src/UI/Settings/Quality/quality.less | 19 +- src/UI/Settings/SettingsLayoutTemplate.html | 38 +-- src/UI/Settings/settings.less | 17 +- src/UI/Settings/thingy.less | 6 + src/UI/Shared/Grid/PagerTemplate.html | 3 +- src/UI/Shared/SignalRBroadcaster.js | 2 +- .../Toolbar/Button/ButtonCollectionView.js | 19 +- src/UI/Shared/Toolbar/ToolbarLayout.js | 8 +- .../Shared/Toolbar/ToolbarLayoutTemplate.html | 4 +- .../Logs/Files/LogFileLayoutTemplate.html | 4 +- src/UI/System/Logs/LogsLayoutTemplate.html | 20 +- .../Table/Details/LogDetailsViewTemplate.html | 37 +-- src/UI/System/Logs/Table/LogTimeCell.js | 1 + .../Logs/Table/LogsTableLayoutTemplate.html | 4 +- src/UI/System/SystemLayoutTemplate.html | 4 +- .../System/Update/UpdateItemViewTemplate.html | 4 +- src/UI/Wanted/Cutoff/CutoffUnmetLayout.js | 11 +- .../Cutoff/CutoffUnmetLayoutTemplate.html | 2 +- src/UI/Wanted/Missing/MissingLayout.js | 7 +- .../Wanted/Missing/MissingLayoutTemplate.html | 2 +- src/UI/app.js | 7 +- src/UI/index.html | 20 +- src/UI/jQuery/jquery.spin.js | 1 + src/UI/jQuery/jquery.validation.js | 14 +- 148 files changed, 2670 insertions(+), 2033 deletions(-) create mode 100644 src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs create mode 100644 src/UI/Content/Images/logos/128.png create mode 100644 src/UI/Content/Images/logos/32.png create mode 100644 src/UI/Content/Images/logos/48.png rename src/UI/Content/Images/{logo.png => logos/64.png} (100%) rename src/UI/Content/Messenger/{messenger.future.css => messenger.flat.css} (56%) create mode 100644 src/UI/Content/bootstrap.less delete mode 100644 src/UI/Content/menu.less create mode 100644 src/UI/Content/navbar.less create mode 100644 src/UI/Content/typeahead.less create mode 100644 src/UI/Content/utilities.less delete mode 100644 src/UI/Settings/Notifications/ItemTemplate.html create mode 100644 src/UI/Settings/Notifications/NotificationItemViewTemplate.html rename src/UI/Settings/Notifications/{ItemView.js => NotificationsItemView.js} (50%) rename src/UI/Settings/Quality/Profile/{DeleteView.js => DeleteQualityProfileView.js} (86%) create mode 100644 src/UI/Settings/Quality/Profile/DeleteQualityProfileViewTemplate.html delete mode 100644 src/UI/Settings/Quality/Profile/DeleteTemplate.html diff --git a/Gruntfile.js b/Gruntfile.js index 8956b314f..fc75499ec 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -27,7 +27,7 @@ module.exports = function (grunt) { }, bootstrap: { - src : srcContent + 'Bootstrap/bootstrap.less', + src : srcContent + 'bootstrap.less', dest: destContent + 'bootstrap.css' }, general : { @@ -118,7 +118,7 @@ module.exports = function (grunt) { requirejs: { compile:{ options: { - mainConfigFile: "src/UI/app.js", + mainConfigFile: 'src/UI/app.js', fileExclusionRegExp: /^.*\.(?!js$)[^.]+$/, preserveLicenseComments: false, dir: outputDir, @@ -139,11 +139,11 @@ module.exports = function (grunt) { nospawn: false }, bootstrap : { - files: [ srcContent + 'Bootstrap/**', srcContent + 'FontAwesome/**'], + files: [ srcContent + 'Bootstrap/**', srcContent + 'FontAwesome/**', srcContent + 'bootstrap.less'], tasks: ['less:bootstrap','less:general'] }, generalLess: { - files: [ srcRoot + '**/*.less', '!**/Bootstrap/**', '!**/FontAwesome/**'], + files: [ srcRoot + '**/*.less', '!**/Bootstrap/**', '!**/FontAwesome/**', '!' + srcContent + '/bootstrap.less'], tasks: ['less:general'] }, handlebars : { diff --git a/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs new file mode 100644 index 000000000..e3c810a8d --- /dev/null +++ b/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs @@ -0,0 +1,30 @@ +using System.IO; +using NLog; +using NzbDrone.Common.Disk; +using NzbDrone.Common.EnvironmentInfo; + +namespace NzbDrone.Api.Frontend.Mappers +{ + public class FaviconMapper : StaticResourceMapperBase + { + private readonly IAppFolderInfo _appFolderInfo; + + public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger) + : base(diskProvider, logger) + { + _appFolderInfo = appFolderInfo; + } + + protected override string Map(string resourceUrl) + { + var path = Path.Combine("Content", "Images", "favicon.ico"); + + return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path); + } + + public override bool CanHandle(string resourceUrl) + { + return resourceUrl.Equals("/favicon.ico"); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs index a55fafc71..a81bb4ab7 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs @@ -1,6 +1,5 @@ using System.IO; using NLog; -using NzbDrone.Common; using NzbDrone.Common.Disk; using NzbDrone.Common.EnvironmentInfo; @@ -29,7 +28,7 @@ namespace NzbDrone.Api.Frontend.Mappers return resourceUrl.StartsWith("/Content") || resourceUrl.EndsWith(".js") || resourceUrl.EndsWith(".css") || - resourceUrl.EndsWith(".ico") || + (resourceUrl.EndsWith(".ico") && !resourceUrl.Equals("/favicon.ico")) || resourceUrl.EndsWith(".swf"); } } diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index dd8950919..d0c5875ca 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -128,6 +128,7 @@ + diff --git a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs index 032d14426..b8e56a44d 100644 --- a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs +++ b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs @@ -13,6 +13,7 @@ namespace NzbDrone.Automation.Test.PageModel public PageBase(RemoteWebDriver driver) { _driver = driver; + driver.Manage().Window.Maximize(); } public IWebElement FindByClass(string className, int timeout = 5) @@ -52,7 +53,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.LinkText("Series")); + return FindByClass("x-series-nav"); } } @@ -60,7 +61,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.LinkText("Calendar")); + return FindByClass("x-calendar-nav"); } } @@ -68,7 +69,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.LinkText("History")); + return FindByClass("x-history-nav"); } } @@ -76,7 +77,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.LinkText("Wanted")); + return FindByClass("x-wanted-nav"); } } @@ -84,7 +85,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.LinkText("Settings")); + return FindByClass("x-settings-nav"); } } @@ -92,7 +93,7 @@ namespace NzbDrone.Automation.Test.PageModel { get { - return Find(By.PartialLinkText("System")); + return FindByClass("x-system-nav"); } } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 5e81c437d..997d904f4 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -194,6 +194,7 @@ + diff --git a/src/UI/AddSeries/AddSeriesLayoutTemplate.html b/src/UI/AddSeries/AddSeriesLayoutTemplate.html index 070ce8c01..401847f7f 100644 --- a/src/UI/AddSeries/AddSeriesLayoutTemplate.html +++ b/src/UI/AddSeries/AddSeriesLayoutTemplate.html @@ -1,23 +1,17 @@ -
-
-
- - Import existing series on disk +
+
+
+ +
- -
    -
  • - Add new series -
    • -
- - - - -
-
+
+
+
+
+
diff --git a/src/UI/AddSeries/AddSeriesViewTemplate.html b/src/UI/AddSeries/AddSeriesViewTemplate.html index ec6e6cff3..829527ddc 100644 --- a/src/UI/AddSeries/AddSeriesViewTemplate.html +++ b/src/UI/AddSeries/AddSeriesViewTemplate.html @@ -1,12 +1,13 @@ {{#if folder.path}} -
-
+
+
{{folder.path}}
{{/if}} -
-
- +
+
+ + {{#if folder}} {{else}} diff --git a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html index 7f47b6bf2..2e16ae6e3 100644 --- a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html +++ b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html @@ -7,15 +7,19 @@
Enter the path that contains some or all of your TV series, you will be able to choose which series you want to import
+
  - - + + + +
+ {{#if items}} -

Recent Folders

+

Recent Folders

{{/if}}
diff --git a/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.html b/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.html index 390e34b46..2f12a3167 100644 --- a/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.html +++ b/src/UI/AddSeries/RootFolders/RootFolderSelectionPartial.html @@ -1,12 +1,11 @@ -
- -
+ + diff --git a/src/UI/AddSeries/RootFolders/StartingSeasonSelectionPartial.html b/src/UI/AddSeries/RootFolders/StartingSeasonSelectionPartial.html index 82d28119c..db07cdda2 100644 --- a/src/UI/AddSeries/RootFolders/StartingSeasonSelectionPartial.html +++ b/src/UI/AddSeries/RootFolders/StartingSeasonSelectionPartial.html @@ -1,4 +1,4 @@ - {{#each this}} {{#if_eq seasonNumber compare="0"}} diff --git a/src/UI/AddSeries/SearchResultViewTemplate.html b/src/UI/AddSeries/SearchResultViewTemplate.html index 585430f65..d87a7e126 100644 --- a/src/UI/AddSeries/SearchResultViewTemplate.html +++ b/src/UI/AddSeries/SearchResultViewTemplate.html @@ -6,8 +6,7 @@ {{defaultImg}} >
-
- +

{{titleWithYear}} @@ -21,42 +20,51 @@ {{overview}}

- {{#unless existing}} -
- {{#unless path}} -
Path
- {{/unless}} - -
Starting Season
-
Quality Profile
-
- {{/unless}}
-
- {{#if existing}} -
- Already Exists -
- {{else}} + {{#unless existing}} {{#unless path}} - {{> RootFolderSelectionPartial rootFolders}} +
+ + {{> RootFolderSelectionPartial rootFolders}} +
{{/unless}} +
+ + {{> StartingSeasonSelectionPartial seasons}} +
+
+ + {{> QualityProfileSelectionPartial qualityProfiles}} +
+
+ - {{> StartingSeasonSelectionPartial seasons}} - {{> QualityProfileSelectionPartial qualityProfiles}} - -
diff --git a/src/UI/AddSeries/addSeries.less b/src/UI/AddSeries/addSeries.less index f690e6413..ee287bbac 100644 --- a/src/UI/AddSeries/addSeries.less +++ b/src/UI/AddSeries/addSeries.less @@ -2,20 +2,11 @@ @import "../Shared/Styles/clickable.less"; #add-series-screen { - - .operations-row { - margin-left : 0px; - } - .existing-series { .card(); margin : 30px 0px; - .add-series-search { - width : 970px; - } - .unmapped-folder-path { padding: 20px; margin-left : 0px; @@ -42,17 +33,6 @@ .add-series-search { margin-top : 20px; margin-bottom : 20px; - padding-left : 20px; - - *[class*='icon-'] { - font-size : 28px; - height : 30px; - width : 40px; - padding-top : 14px; - } - input { - height : 50px; - } } .search-item { @@ -101,12 +81,8 @@ } .checkbox { - width : 100px; - margin-left : 0px; - display : inline-block; - padding-top : 0px; - margin-bottom : 0px; - } + margin-top : 0px; + } .starting-season { width: 140px; @@ -116,9 +92,9 @@ } } - .labels { - [class*="span"] { - margin-left: 3px; + i { + &:before { + color: #ffffff; } } } @@ -147,16 +123,6 @@ li.add-new:hover { background-color: rgb(0, 129, 194); } -.btn-group { - .dropdown-menu { - right: 0px; - } - - .add-series-import-btn { - width: 93.3%; - } -} - .root-folders-modal { overflow: visible; diff --git a/src/UI/Calendar/CalendarFeedViewTemplate.html b/src/UI/Calendar/CalendarFeedViewTemplate.html index 2c03b814e..d920089b3 100644 --- a/src/UI/Calendar/CalendarFeedViewTemplate.html +++ b/src/UI/Calendar/CalendarFeedViewTemplate.html @@ -1,29 +1,33 @@ -
- -

NzbDrone Calendar feed

-
-
-
-
-
-
- +
+
+
+ +

NzbDrone Calendar feed

+
+
+
+
+
+
+ -
-
- - - +
+
+ + + +
+ + + +
- - -
+
+ +
-
- -
\ No newline at end of file diff --git a/src/UI/Calendar/CalendarLayoutTemplate.html b/src/UI/Calendar/CalendarLayoutTemplate.html index 6a7e293ed..f531ba3aa 100644 --- a/src/UI/Calendar/CalendarLayoutTemplate.html +++ b/src/UI/Calendar/CalendarLayoutTemplate.html @@ -1,5 +1,5 @@ 
-
+
-
+
    diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index 4e3aec332..c386acbda 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -2,6 +2,7 @@ define( [ + 'jquery', 'vent', 'marionette', 'moment', @@ -12,7 +13,7 @@ define( 'Mixins/backbone.signalr.mixin', 'fullcalendar', 'jquery.easypiechart' - ], function (vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config) { + ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config) { return Marionette.ItemView.extend({ storageKey: 'calendar.view', @@ -24,28 +25,7 @@ define( }, render : function () { - this.$el.empty().fullCalendar({ - defaultView : Config.getValue(this.storageKey, 'basicWeek'), - allDayDefault : false, - ignoreTimezone: false, - weekMode : 'variable', - firstDay : StatusModel.get('startOfWeek'), - timeFormat : 'h(:mm)tt', - header : { - left : 'prev,next today', - center: 'title', - right : 'month,basicWeek,basicDay' - }, - buttonText : { - prev: '', - next: '' - }, - viewRender : this._viewRender.bind(this), - eventRender : this._eventRender.bind(this), - eventClick : function (event) { - vent.trigger(vent.Commands.ShowEpisodeDetails, {episode: event.model}); - } - }); + this.$el.empty().fullCalendar(this._getOptions()); }, onShow: function () { @@ -178,6 +158,59 @@ define( } return downloading.get('title'); + }, + + _getOptions: function () { + var options = { + allDayDefault : false, + ignoreTimezone: false, + weekMode : 'variable', + firstDay : StatusModel.get('startOfWeek'), + timeFormat : 'h(:mm)tt', + buttonText : { + prev: '', + next: '' + }, + viewRender : this._viewRender.bind(this), + eventRender : this._eventRender.bind(this), + eventClick : function (event) { + vent.trigger(vent.Commands.ShowEpisodeDetails, {episode: event.model}); + } + }; + + if ($(window).width() < 768) { + options.defaultView = Config.getValue(this.storageKey, 'basicDay'); + + options.titleFormat = { + month: 'MMM yyyy', // September 2009 + week: 'MMM d[ yyyy]{ \'—\'[ MMM] d yyyy}', // Sep 7 - 13 2009 + day: 'ddd, MMM d, yyyy' // Tuesday, Sep 8, 2009 + }; + + options.header = { + left : 'prev,next today', + center: 'title', + right : 'basicWeek,basicDay' + }; + } + + else { + options.defaultView = Config.getValue(this.storageKey, 'basicWeek'); + + options.titleFormat = { + month: 'MMM yyyy', // September 2009 + week: 'MMM d[ yyyy]{ \'—\'[ MMM] d yyyy}', // Sep 7 - 13 2009 + day: 'dddd, MMM d, yyyy' // Tues, Sep 8, 2009 + }; + + options.header = { + left : 'prev,next today', + center: 'title', + right : 'month,basicWeek,basicDay' + }; + } + + return options; } }); }); diff --git a/src/UI/Cells/EpisodeActionsCellTemplate.html b/src/UI/Cells/EpisodeActionsCellTemplate.html index 26161afce..a0d4c81d4 100644 --- a/src/UI/Cells/EpisodeActionsCellTemplate.html +++ b/src/UI/Cells/EpisodeActionsCellTemplate.html @@ -1,4 +1,4 @@ -
    +
+
+ +
+
\ No newline at end of file diff --git a/src/UI/Cells/SeriesActionsCell.js b/src/UI/Cells/SeriesActionsCell.js index 83a3ba1d2..313f8ef29 100644 --- a/src/UI/Cells/SeriesActionsCell.js +++ b/src/UI/Cells/SeriesActionsCell.js @@ -18,8 +18,8 @@ define( this.$el.empty(); this.$el.html( - ' ' + - '' + ' ' + + '' ); this.delegateEvents(); diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less index 19b90c177..1eacb5f58 100644 --- a/src/UI/Cells/cells.less +++ b/src/UI/Cells/cells.less @@ -16,6 +16,10 @@ .episode-title-cell { .btn-link; .text-overflow(); + + &:hover { + text-transform: none; + } } .air-date-cell { @@ -88,7 +92,7 @@ td.episode-status-cell, td.quality-cell { } .episode-actions-cell { - width: 50px; + width: 65px; li { .clickable(); @@ -110,12 +114,13 @@ td.episode-status-cell, td.quality-cell { } .series-actions-cell { - width: 56px; + width : 56px; + min-width : 56px; } .timeleft-cell { - cursor: default; - width: 80px; + cursor : default; + width : 80px; } .queue-status-cell { diff --git a/src/UI/Content/Backgrid/paginator.less b/src/UI/Content/Backgrid/paginator.less index 929dabd99..61fced052 100644 --- a/src/UI/Content/Backgrid/paginator.less +++ b/src/UI/Content/Backgrid/paginator.less @@ -17,6 +17,10 @@ font-size : 13px; position : absolute; right : 0; + + .label { + margin-top: 5px; + } } ul { diff --git a/src/UI/Content/Images/logos/128.png b/src/UI/Content/Images/logos/128.png new file mode 100644 index 0000000000000000000000000000000000000000..ae8cf56c716d5dad754ee03522bea6775fd7b5ae GIT binary patch literal 7233 zcmV-H9KPd;P);W+bkP$&g;tD8|%=g}i!jnWtabbN5=o19gdEzpU-A~*If`X%%L>&=*N>Jd*5)uV5 z2#H}60s;w(Awclm|5B&DU0u~(o%B)(eZH^1PO7WwF6Z2H{&ViV=Q^mCQdwEqKd!*mfWP7Fm%!4U$+CuyTTDa`lKn*~RB z)Z0=Uqz4NmI)cP_`0$yRu&u9(Hb@NyHmDOMmH$(i`92W_%o@>m6Kb>oL`Bz2yL-gQ zywcLr*f39hrxh#So!z!w`^BOk1J-{5GXbdhp^}m`{C#|^q|iZg!41rY%n`HN4TKApz@A31V_HgDcSNl8~y^XARN-1Uw5pqAn@Xz0+P zt9KR@_*Dq}Y62E5S`^!&RqH&uICpr1=SO1AR#K%){ z@gCZ>dpGSraDYynI7wIa=}qn0wxy3h{#O_iXq20qOY`Q>qa8mK$o@iKVPv8YTefIH z$BrJ8ztu~7iej!GMvm-P>LoU} z$yC|68J*trIpuE6qjDj&Oy|#^myL^xiV|kvd&JE$f=L!ql;1YqgYyN`sDq9VWFaG;P{*NdRKcl?c_TehRJ^`AI@N=&>$ zV1o|Q6tK#xsHl)8;hJmuQ4*?f(&cAQo;p?Qy#p|RIP~>WsWM^ zfQ6v^t86NmexJ*`xX}<6Cb)?6=gp-dg9q0t#-qQcPMb!{g#d70@nBF142G*$+5KwT zHE|e~@7`|OS4?BaJVF!3k0)(GNiScflI!@`h#92K>KXa+V7$tF6%)k#d6*j}K;!lI zqoeK_l|~aL{-^xAHqiPF8z}jP8=cJOzS1*4qG4kyPk+{p`DT3uLjP;b$G`D(aj}j6 zL7+CR>#~@`YCs1#nIeQD9Fuh!^MKYhkb8kUkud-v`048{cW zyUfm}CRg-zW4;-o-_idX^O;h#O*DSj0EUvK3IWtqj26k#tNQYydYS5rQHEG(!iD+T#8Z~MpRajfc89KD%Tl(XOi4@zh8+9%} zB*9;wKE3JWiIegkbPS$B@S{hM?h;fM6ckW)_J?%*_;HGkj+T)`JJPvx=O`m%35~pG z6z$u$SJo5lLpwkxPM(zQW3bm%fVhUuT2j+#i>YykuGDzh(^QhTfm*a^A)~19lo%JZ zjcX&H$1|8#fB(IInlWFpM0{G#nl&rC+8|I{x{VpWSSykbU|3jKD47U`>VXcf|JL_b zD!(<2%GRwCT49XSwTWxfMmCyb;5<^UzWQo$eZNG%Aav~L(GSq@JMZ+=2|*(OVVJ5< zR((p%n>Ul~KpU8WX6@sV59VX!Z_Iqh4Itwiz>oV7BmeW&pUP;e1xog|tjvl4U@c#Y zFX|6MP*HKlg^?;rx9_)lvhjK$FnY$*b@;>Z7zPg>6jWi@Cv5tfoE&;{afVwE%St=+ zYX7@WGfn%7pYfvhjR-jndU?7b(hD;O`oeq_6FfF)vZ(+_R4YIZzz#a0JuPqwfv@z* zs#Wp>8Ze+g4d_2W`|j^|hHn#$UcY_=trFz{)R{5btKC(Yk3NWVcn{@Qf%!5(gza|X znT#q409A1bH!At^!Ub{`&{K$4F9Z>*g)O{xh@4HVlDj3CgAcuUapXit*OTS~o!7W= zBPURWI@JrvFTeakJAeGqsl^bP#CK`war$)iXVrE|!Ssm9uT!(t%c<$Dcgbr7_b1cY zLwiMKI|qXKDi1S!HUZk`uhv9^K3K$d4Fqt+HZrDjPfC2{Gx_(~h`KIuZ*@I^8U(>L zfFnK5Fe`)c2m9da$gOG__~xjbr!siNqn)72Q)Tr1UA^Tua6y~^cp#%PI(6zqPtTlL zUGtW1rUe|{B7XjGiJqE1U8>Le8lX`-9U;!k1QPx={aKCP<00Vp}1H|E5D`gZNJVG&#z3gPZQ~NFd2gQE-g-aO_9)1tL zFI@PoIwN1DV)2d+mIc5cqhIeH-E{LU^!<(F$20XCY92(`d0S)henyBwB?xSPnT-yE4LK$l2wFMx49*ZZ{`ErzjZ`f3| z3)roaIy(GGH|ERO{>zU_n{QMG>Va=C z|9}4RQXrKRrinYK)5Q)Q^OLl&Z$K$6J)OSza*d1Kc$@;W$Az%Y5>_3~al z_~Nju8bW0)f#3Akp#^v?gX%VN8T#9#3v><6oT;D>Kl;cWLAV`&<$V*<(uz#4fLTn4_)n1A-rKKk*IK~n9TmBH7sGWsbY0KuSHvu3?( zh5=H7QGwyZ@3b_d=Lr)aVrVDOCu8~wf$2rl{=*~SQ)%=A4+N{aDe6>l9Uc0Q4^}NE zPnu-uJ_rGplj+s!sr>b}5deg9Re*(ZWusIMld^AH9&+A3nuWb zhHv%ZSO7NQgVG_RB`{>0+ObtLCyG`>zH0bZjk2MPgxmf~?Qa-LyMFymhMZOE*s3}0 z-?UbIzLLTPCNf~thkVuWty%_F^K^V>DV5D0PfgDpcWDQQi1i^~l<~sz&(n3+UK>mS z$PhRnT`vGWP5b(T=FOW=pMCzB3)A(&pmtWXe;Z9*j~7Wmr7}c~<*N+AH86dD>z=}7 z43?_evReP)8yTS5^W{fg%V2?1L&Toi!JY@6#r>N$eiQ6<4bIT8DgehR$oY6NNp%0{ z(LS#M@U+f=f2%71B(Ormqyg2cBecQ(g-=S&W3_BwuHPl_(ENGxLSeb!4i?u@+`piw zaltfaAeMJQQzX2$rrOL0;T;LD<;XpcfuO;mTmGJ;g20gF>`P2c^y~W&KfuJ2FY4Y3 zwH!5>8c&?#*Y`s053z{=#D}UD7yD z93s}YL(W`^`|tegzlYL!x!#EZ{5AJqRl4D(o1Am$JRk2ZG|M4h4hzFez~+;n`27MP zmd&1E7s)!$2)VLZPiTjJK0$4VItLNzO|Y0AuA@Z& zLrOh+US8#A;~sg|?|{!L#oYC1)rEdQf3g9^)(Q3K2eB(?G&k?*`l+afA)OO|i|C81 z>9V!!a$9VHPpV^wT0j+I+Li4(qh_|Jd|gHVG6~f~p-(*Ce&hrf4+Zt&dNafI?ZAC@ z*wF-vB%360E-Wl^?x2-Bel%vQAd5Q~BoTFdVqj98`apI2B-4N!Z3tY5H#`#dc? z4I;(cMgXc}f9*o`JNs_W?Xtre0&t}*aDb1XDAFdQU)uOiz6(HGn+O0ffGu+QtDuNO ztE?`WU{87V@8M4NNhF0m{&C3Kb<{OQj;D6mg(B@z5xK}hTWEpk9wKSzD0m0xJX}ZT z;<}tGNN;JIPJ}&21e3ul>W^>Oe$?Hl9bo~`k=&;j*Tx0-F~foU)$8bRd>Yyemw>^$ zG*?dz1)H_QE*QWzWHvJFG-7I7J0JkXHPH(=^{sstg<4(tYe#|r?6DILFd|-cDMTa(!MYT5OnzPVF{XeI~Ri|o^Myz2|yS+R-UA@HmUnbZHYS1`vU~>R5j-y z0KQS%ht<$_2nRdta+)XB1jzI*^!utG{gx~+9%}|TV_4!xg|>(WR*p{=b&hjev*0Q7 zS$0+?B_t$-y6PFW(Ew#-CtN%NV}B+00ZRMp(a&1FW}&k7ebHtS1%7*duy#5xX()-T{FU#ETg@HLGwg}?XT(m0x);VT%23=V5PnYdr?6ttYs~N-8 zcJOwv^OcoUxa-G|avzIAZLusI=L2voy{g;9uqqfkf`SJ8o*z@K`hxOuw}f(5P%aB+ z3=mQ?;Ez=B*uNJHJiyHNOS{*HGzEUX3IanG4FnqY*U2DY40iO^1m<59{E&vT*Qx@L z6YA0LudH3r1ZQ7)!tcNk?^T(v&h@+1$)FuZ+ue{}KGYgO-5wqiAc)gI8aAl!1XEVB zcFBbyN>)$~7pqyjkfIg1pt^w~nJi-2ENUKE>2j7Y04d5*vxKSJ!PIuBS;@Ff{P(iA z-jazSLqLB(wlGxyf(``X|089bx?PG#3qrm|+rg}6?Q$aB4&A8ZL(}C!Ojg6jNI-Gu z^ABW@NA>g7c?y--1=N?#?J#N|XADDXIP4J&_UPwx1k_M)cCZBi$X~x*3dA8_J@di9 z!{;Lm5w=<4hO(b_(y7;;lD{L17Z#I7x44*nj8n(UGIwvM%F|_XVyD&V653<%J|pH! z^B@Egi7XRF%yh{W#O*L@AD+Qy#k=o@LI9j5Kho%8uxQbuS1Gz)w55AF6^aI!aIgprAOI z;BT+R5U`qu56PX3a`J^Nm~!n9nTp1#-bKBPatL@F2*EuX5B`4^|D(?oiY#Fhf>8?` z40+(derMFoEJ@V%qP-ON-z(f0j#EW&tSXOWPYIm7mEkFYlea`v&D(XL&Vu3POEDft~_h0j35SuvV;Jnnh8KqQpI8-WazMAE-BoM(!^mDUA^RM!_K9Jk5X)Ogj)(X zPif-3rJ~cH3}TihPG1H*4sQvfJ*A1m`);}U78*BhY%l~M)l>s$LJ;s|5o5=Vb2&!U z$R=CKx*dqDT~@FAv%Y*i2wFgff7J^{)4_8C9r@dmn`_zTn{}q$$SgakFPMOjlnr69ho&C!ML*`>t)fXMA z&kUwNFrxg|a%YIxs0?0DpoW;$@GY<2#oukjH+v2YAXN~^K#t2eplt`^G7^&dNQUdr z3_=d!@|PZ_t=i!cTn5i;;Q6s*#?XED-Ro}wFg!FW;K#Hhnw|>O7N)122gzxD6`C9W~YW7TJi$*D%oaOHZLb%w)8E3 zCXq5dHqO(UK))@qSs@Vr#!VaDBXb@yYMFs5vlX?RJi@39Pua(e5;fpmM%T^iYjz!N zz-U+7fNO`}Uu0UgoLCa?!Xg=eO_O`#rKtdDr%vbigZWm`t(tEi2P#)3+-o~vc=~ri z<|A>f0767baq6lcgrK-OX9rKL4i;eMLq&SZ0LJPci!3i9eqo!N);GQ1m+MBqVMh*9 z)4^=us1_B4TX~n!$n{h&)@Jy2dISO=L_Bzlp;yCYz-5LIRPzkMiJpG6a(w(^s=_&f z%zT~;hiX&769ch2BcGu1p4Z8vV)tjh>5Q_ed+Fs&o{vYzA`c(3j@*9R5INsoQBmPj zkforYK$Zca*tc)5T*X^hbkV)Day%_#61+oyJZ<8jR4Tvs8Hy*tdIXbrb~oD7eAZy{86`Sd4+`x1`5W9aQNhCX=kppa~|go;K; zdzJ7o)R|4I?QjY~@prUgY^v9AvyaEf&k^@c^mdb_ok8M7bF2VDtALNwx*Hu1ZJ{nQ z!#3jPZ@%${Jb^4!yKKP_EauoM>hji-44>1#I?oY~Pn0;wiojU}hQ(IBIA6Ag;gF%y z>M|b^@{-D zd>J!D`SrSWF3jifrn-fTnU9f=BVZkyRvU&^_2Jmdd-QNJe)6QpY?ETujDSHFE?6K1 zLDdM10rX*I83C;CpjK;^%D!PCP`8}vL)TbD``oNqGP-J_`YpTf4qqFnKV1wXf6|mG z&QK{MV%{#r2>sx|dtB5$qi4N$pn3r#M~o^QM%nTm>v zXwTlg^7L?(xDStQ+bmB>Z#VHJ`HkstqdpXr@l#RZ#H!Y(TIu$M5abIXh!p^(A8a{} za>rbK`^Ohh%=N>h+V5~=r$icfo0HHx3>AIa_Fgc)|Q6r`i|HH$u6`0Q!X3 zm6RO5q?yl};Lq1xM<0LuFUrez580!SqN1W`-@4B!x@9|gd@anuflXiKZ`-y#IXf$> zw7PZhTau`A6=%{f>pL*RYJ~4nXTIvjz4^xLUISck3E>(FUrF0BAyh7y(Q|Y*_7A*&NIfjGq{&vI3eZR8$<%spJuN-<=<3zHh+rgZJMn z?bfYZdLWq}a1FquO(0=KQCgV2mI(Gf-P>}m8Y2LTAUI7zn8&7s)mJmEF6gLH0-y;& zye0$#!@PE(Vr|st1hY^_s9GxoAx$$2VQmoPQEv+Y2x9|DIU3`0LRA5W9eP3AjXe7j zG7H5T<1<2C5r>_6MF;`}V0tYU1lus)mI9y?gi*D~G{BvkYbVCrS^#t&Lz*TG@imO; z0CZUziTO${eN5K?R|3}AY;9Y=eO761cbfFN9N1H6#0q4~8{U6>gb0RLbH z2*s7!cTxaB96oEA@uBeD!vbI(Kd2wl1jI_A6_vJh1JI{08^WKgV#whLW?SAYL%QS|mpG995 zBhzxG#Y}UjOqo(XmUW%R03694-!P5Ds|gWEU_^3XivR-_v&YYtU5`hUOt&y1T3dqx zTOVB}xQ5i!)HJ*SaFWQny1KGR#ZsGVIS>D^@<7sOPc-)~s@3IUfxsDofq~;fudJ-Z z-hKOBP2Hxr-k=X2bv?XaZkGV<+*jiH2x9?z}zaI~(t8wM( zRmg*b&^X|VE{PQK?j~q76F z|0a0(KvZx6o)7Qwxf|m?vIkBQ>tuC4JJ}HHHf-QKy;FJ@!R&0!0wJ*D2Z;QKhNj5S zgt7yhAop~Gnw>cv1^suH`I3*1kKHUOuu)WoSYgGo<$OU! z2$>U+gVCap${Z%3ne*kGEQw4u$Kia31SFmk6e)|jGuGADJ6upxQSrhWjBra!>-Y&Y zvY4myr(H?W?Qp?hi5q{C)%tpS$3#Fo+Ju&tmca!lY1J$XJ+wQQBEhUG;&aJj%}<&g z;cEq!&Slh!M%j*gIhF>0scSzm!19FXaw?zfZd+$ zHY+k@&VgC}2tM~a+*ySrS+jaIoFCl5bX7j)X-oOhcuS=`{!R6j2>3A%-iwy-Ojuk} zG8%zgfu&bd4j(BkEoG&Zl~Jib&+UevzT>%_#9+|#IJbry0huf+VslIvPeLE}H9UhB zp{BM5g@uJS4NTb9C`cH7?&mWyc>2XG89Ym}V7Pv95RiO=ij1$XFU;(W-(uO0&YZpz zF`7FeJC&tv7hXA!CMF^;@6vDr2{s!NYa8|FjT;F2@KbcCZ}Nqy#uH#nObiRl$PopG z>IOv&5vLZ6tn%06RxFH)h9*A;Qsxi4ckW{UuN^GK!wHDhYIVc635Uhxc+|;sGH~(% znM{U#d-rkzV-YIh$;XbPy7~bg8$01OKZJKyWTo`9G-GIJ=xj#7I3y9#hh;0G6rImH zjRY=k)ACr3S`mfRl$0@plT4jD6(_zwj+nJEJZdKObg}{##K$r-vlLeF5nVCsR+}eo zKUN@7{}FfpewFLy_)oBF*Ur~&$rmgLW7g0k|MDfcv3~HGvuH~}cII`5HzR7#Q%;^N zijV(T{01&2NJ&jKs#Im`@^W*O|GTT%e|b4oS}v!`aovt>T+f$Snwa68l-8nomg~88 dEbIO&zyMz+qJy)^etZA`002ovPDHLkV1hj-__Y84 literal 0 HcmV?d00001 diff --git a/src/UI/Content/Images/logos/48.png b/src/UI/Content/Images/logos/48.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a0093232825cd21ea402fe7961be42e0618380 GIT binary patch literal 2547 zcmV~4_Fx+Q3q7$Zuw7BohQYlKORFEm0B zR*AKOAt4bFhL<549tIiYb+=D5-45dn%;id*(z5Tf7eCM3*)8}3j7zgU;=m;Q{ zf|O@S@gfE99rSc9B&D5{3cR+rw=W#)yG_QxG%~t@lvoYZqahR~pOigBnDR*xK!bLM z2J!JE)JCdUt(b^l98DsHl#MX4gc^w_g0zpD02s`>$1 zT7Cwvjpd4#F?3tso`uh1fSiT||7ixrW{&FG)#Bi(+G9@`qh2NvW-`uNMM? zf`ys>{sPg4;Qd0R;Qhz<=rwz`blGy@%-OR7=|84YSy?H>uSys)_sqX!3U*Hi4|#Uv z$j8{fO|zWq*8pkEVCy`&hIdj@pr)pVqT=Wu0uT}j>f`T$TCL`&xVX4LLP7%k?)m3M zA&#c_$+6?a<}c8DHYXwvW#n1&ZT@`Q)?|o@d6^B(A5?MvWTa~*D;%j0bu)+fU9<;!&C4`VyFwgB0riqm6OR1@D;R?>TEXe_9s z;y}IoO>UozIEp&g+V{FOZSxNW+t*Xc9-IlCXO8ga+me$ZG9p56*g*sc;~SX<{WyI+ zNk{kxS=LmldV<`ypuVjUWOF9f2r`1tu^`btuT8gZboZysWZYvBN z-3hU9ksW>qM-_;m0u6hgd}VUz&975zq5lskBo>k27N|> zC;-}iwvkaO%wMp;Ai}ffFM^)M8$de4U+?&ypBkX&z&5BZI&V-j2eY!CSiy#&O=g;7 zpizVl9U__EIR?FV$Zhb78VpS519u?uESaUS!a6q zLaG5a2VR?7n2Xkcnb;AC6e5OpEA#N62zJeqix%Kl3mZBQn-k{}Y5&F@DRqg30EnE_ zTFQMuEVcg93XP3T9DPS8$5G8QDh(hZVpxz7XI$Nj)wEd~MH~-G z%m;9;Q~CL#HGl%B#Eig~VH|_@&uXfX?l$P$zG6@lhKRJaz8g=YSL#DD53Wt5yUopT zpB#EbP?4!7CutOwl$L_TOhSdgmt#Hkxp_2>L3_6C?SvaEo+a_lpWxofEa?C7ztCA; z0ZS%7>q2qAl!-EWtWj=r#+h?aviOQ#%VOE#~X?4bg)5XPC24f#m937oN zwrCZJf6~DgtibX=r+M4-2aRy~^P}MRYzPn7+z69*rH}31V&Q7A4GJ67KyxKu-7w-^ zyJn41=7YSOY9&;MrH2n6LUwjGR1oyg2d)YZB&JEH4k>H?j;>Cu?abM;+)vp0&f1vo zsM6Ncv3MG*uyW^ZR+g4D#bN~IXm4bDM(X{+2YY!YLLeup>B)P!OS)R&GYRfI zG6#oOR)X|W!C;Q`LILS#4XN8x^r4?>=){$wEooNPM;tlKkOl3?rWvy!xqJwUp$dht zH96U+OkGJyiIA6BsomSx^hGdOqTekHxfHhj+?R<6{YBYU`D4kfE&S>i3p$s8$l zWIWAPTDLay)yC8FH?S)$4Zct+;m>csZB%v+BhK*fa47uh6678~26F-fALoyVKXer- z!Eehyxpq(!2M-?7{_wGB#IG@kytchE#{g&aMZb}}>f$Lsq5s5gEc=<}>dvnUJT}>7Bg{G;ovAn;vMdc=R#p1^XA8+po zW1f+fl@%4@JhA)k?rwU{XsoZ#xp6K(e$-zn@oPmo@l~NY*oT)_`a%Y zQ*&d(`~R<>Sr-}e(c9EW`@}OtASv%p0`nN-cpLl0el))tpcYaLrQ^py$neDdYG6Q+ z@%Y&T5kEX>KYI-0BMNx@yN#C~q1rXaSKR5@?>6OQefR$a7y#zRuU)0M>q7tl002ov JPDHLkV1oB0)6M_@ literal 0 HcmV?d00001 diff --git a/src/UI/Content/Images/logo.png b/src/UI/Content/Images/logos/64.png similarity index 100% rename from src/UI/Content/Images/logo.png rename to src/UI/Content/Images/logos/64.png diff --git a/src/UI/Content/Messenger/messenger.css b/src/UI/Content/Messenger/messenger.css index 9d6786bb0..9fc58c936 100644 --- a/src/UI/Content/Messenger/messenger.css +++ b/src/UI/Content/Messenger/messenger.css @@ -4,93 +4,98 @@ ul.messenger { padding: 0; } /* line 8, ../../src/sass/messenger.sass */ -ul.messenger li { +ul.messenger > li { list-style: none; margin: 0; padding: 0; } /* line 14, ../../src/sass/messenger.sass */ +ul.messenger.messenger-empty { + display: none; +} +/* line 17, ../../src/sass/messenger.sass */ ul.messenger .messenger-message { overflow: hidden; *zoom: 1; } -/* line 17, ../../src/sass/messenger.sass */ +/* line 20, ../../src/sass/messenger.sass */ ul.messenger .messenger-message.messenger-hidden { display: none; } -/* line 20, ../../src/sass/messenger.sass */ +/* line 23, ../../src/sass/messenger.sass */ ul.messenger .messenger-message .messenger-phrase, ul.messenger .messenger-message .messenger-actions a { padding-right: 5px; } -/* line 23, ../../src/sass/messenger.sass */ +/* line 26, ../../src/sass/messenger.sass */ ul.messenger .messenger-message .messenger-actions { float: right; } -/* line 26, ../../src/sass/messenger.sass */ +/* line 29, ../../src/sass/messenger.sass */ ul.messenger .messenger-message .messenger-actions a { cursor: pointer; text-decoration: underline; } -/* line 30, ../../src/sass/messenger.sass */ +/* line 33, ../../src/sass/messenger.sass */ +ul.messenger .messenger-message ul, ul.messenger .messenger-message ol { + margin: 10px 18px 0; +} +/* line 36, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed { position: fixed; z-index: 10000; } -/* line 34, ../../src/sass/messenger.sass */ +/* line 40, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed .messenger-message { min-width: 0; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -/* line 39, ../../src/sass/messenger.sass */ +/* line 45, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed .message .messenger-actions { float: left; } -/* line 42, ../../src/sass/messenger.sass */ +/* line 48, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-top { top: 20px; } -/* line 45, ../../src/sass/messenger.sass */ +/* line 51, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-bottom { bottom: 20px; } -/* line 48, ../../src/sass/messenger.sass */ +/* line 54, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-top, ul.messenger.messenger-fixed.messenger-on-bottom { left: 50%; width: 800px; margin-left: -400px; } @media (max-width: 960px) { - /* line 48, ../../src/sass/messenger.sass */ + /* line 54, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-top, ul.messenger.messenger-fixed.messenger-on-bottom { left: 10%; width: 80%; margin-left: 0px; } } -/* line 58, ../../src/sass/messenger.sass */ +/* line 64, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-top.messenger-on-right, ul.messenger.messenger-fixed.messenger-on-bottom.messenger-on-right { right: 20px; left: auto; } -/* line 62, ../../src/sass/messenger.sass */ +/* line 68, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-top.messenger-on-left, ul.messenger.messenger-fixed.messenger-on-bottom.messenger-on-left { left: 20px; margin-left: 0px; } -/* line 66, ../../src/sass/messenger.sass */ +/* line 72, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-right, ul.messenger.messenger-fixed.messenger-on-left { - width: auto; - min-width: 350px; - max-width: 800px; - word-wrap: break-word; + width: 350px; } -/* line 69, ../../src/sass/messenger.sass */ +/* line 75, ../../src/sass/messenger.sass */ ul.messenger.messenger-fixed.messenger-on-right .messenger-actions, ul.messenger.messenger-fixed.messenger-on-left .messenger-actions { float: left; } -/* line 72, ../../src/sass/messenger.sass */ +/* line 78, ../../src/sass/messenger.sass */ ul.messenger .messenger-spinner { display: none; } diff --git a/src/UI/Content/Messenger/messenger.future.css b/src/UI/Content/Messenger/messenger.flat.css similarity index 56% rename from src/UI/Content/Messenger/messenger.future.css rename to src/UI/Content/Messenger/messenger.flat.css index 89aa3bd66..df8d35aeb 100644 --- a/src/UI/Content/Messenger/messenger.future.css +++ b/src/UI/Content/Messenger/messenger.flat.css @@ -234,33 +234,28 @@ ul.messenger.messenger-spinner-active .messenger-spinner .messenger-spinner { transform-origin: 100% 50%; } -/* line 15, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future { - -webkit-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.24), 0px 1px 5px rgba(0, 0, 0, 0.6); - -moz-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.24), 0px 1px 5px rgba(0, 0, 0, 0.6); - box-shadow: inset 0px 1px rgba(255, 255, 255, 0.24), 0px 1px 5px rgba(0, 0, 0, 0.6); +/* line 15, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5c5b5b), color-stop(100%, #353535)); - background-image: -webkit-linear-gradient(#5c5b5b, #353535); - background-image: -moz-linear-gradient(#5c5b5b, #353535); - background-image: -o-linear-gradient(#5c5b5b, #353535); - background-image: linear-gradient(#5c5b5b, #353535); - background-color: #5c5b5b; - border: 1px solid rgba(0, 0, 0, 0.5); -} -/* line 24, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future.messenger-empty { + -moz-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; + background: #404040; +} +/* line 20, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat.messenger-empty { display: none; } -/* line 27, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message { - -webkit-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 0px -1px rgba(0, 0, 0, 0.23), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - -moz-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 0px -1px rgba(0, 0, 0, 0.23), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 0px -1px rgba(0, 0, 0, 0.23), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); +/* line 23, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message { + -webkit-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; + -moz-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; + box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; -webkit-border-radius: 0px; -moz-border-radius: 0px; -ms-border-radius: 0px; @@ -272,17 +267,15 @@ ul.messenger-theme-future .messenger-message { font-size: 13px; background: transparent; color: #f0f0f0; - text-shadow: 0px 1px #111111; font-weight: 500; padding: 10px 30px 13px 65px; } -/* line 40, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .close { +/* line 35, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-close { position: absolute; top: 0px; right: 0px; color: #888888; - text-shadow: 0px 1px black; opacity: 1; font-weight: bold; display: block; @@ -294,62 +287,51 @@ ul.messenger-theme-future .messenger-message .close { border: 0; -webkit-appearance: none; } -/* line 57, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .close:hover { +/* line 51, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-close:hover { color: #bbbbbb; } -/* line 60, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .close:active { +/* line 54, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-close:active { color: #777777; } -/* line 63, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-actions { +/* line 57, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-actions { float: none; margin-top: 10px; } -/* line 67, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-actions a { - -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.1); - -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.1); - box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.1); +/* line 61, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-actions a { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; text-decoration: none; + color: #aaaaaa; + background: #2e2e2e; display: inline-block; padding: 10px; - color: #aaaaaa; - text-shadow: 0px 1px #222222; margin-right: 10px; - padding: 3px 10px 5px; + padding: 4px 11px 6px; text-transform: capitalize; } -/* line 79, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-actions a:hover { - -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.2); - -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.2); - box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2), inset 0px 1px rgba(255, 255, 255, 0.2); +/* line 72, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-actions a:hover { color: #f0f0f0; + background: #2e2e2e; } -/* line 83, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-actions a:active { - -webkit-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.28), inset 0px 1px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.28), inset 0px 1px rgba(0, 0, 0, 0.1); - box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.28), inset 0px 1px rgba(0, 0, 0, 0.1); - background: rgba(0, 0, 0, 0.04); +/* line 76, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-actions a:active { + background: #292929; color: #aaaaaa; } -/* line 88, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-actions .messenger-phrase { +/* line 80, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-actions .messenger-phrase { display: none; } -/* line 91, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message .messenger-message-inner:before { - -webkit-box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.6), 0px 0px 0px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.6), 0px 0px 0px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.6), 0px 0px 0px 1px rgba(0, 0, 0, 0.2); +/* line 83, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message .messenger-message-inner:before { -webkit-border-radius: 50%; -moz-border-radius: 50%; -ms-border-radius: 50%; @@ -365,23 +347,26 @@ ul.messenger-theme-future .messenger-message .messenger-message-inner:before { width: 13px; z-index: 20; } -/* line 105, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message.alert-success .messenger-message-inner:before { - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5fca4a), color-stop(100%, #098d38)); - background-image: -webkit-linear-gradient(top, #5fca4a, #098d38); - background-image: -moz-linear-gradient(top, #5fca4a, #098d38); - background-image: -o-linear-gradient(top, #5fca4a, #098d38); - background-image: linear-gradient(top, #5fca4a, #098d38); - background-color: #5fca4a; +/* line 95, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message.alert-success .messenger-message-inner:before { + background: #5fca4a; +} +/* line 98, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message.alert-info .messenger-message-inner:before { + background: #61c4b8; +} +/* line 103, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message.alert-error .messenger-message-inner:before { + background: #dd6a45; } /* line 32, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-soon .messenger-spinner { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-soon .messenger-spinner { width: 32px; height: 32px; background: transparent; } /* line 37, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-soon .messenger-spinner .messenger-spinner-side .messenger-spinner-fill { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-soon .messenger-spinner .messenger-spinner-side .messenger-spinner-fill { background: #dd6a45; -webkit-animation-duration: 20s; -moz-animation-duration: 20s; @@ -391,9 +376,9 @@ ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-soon .m opacity: 1; } /* line 45, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-soon .messenger-spinner:after { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-soon .messenger-spinner:after { content: ""; - background: #333333; + background: #292929; position: absolute; width: 26px; height: 26px; @@ -403,13 +388,13 @@ ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-soon .m display: block; } /* line 32, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-later .messenger-spinner { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-later .messenger-spinner { width: 32px; height: 32px; background: transparent; } /* line 37, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-later .messenger-spinner .messenger-spinner-side .messenger-spinner-fill { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-later .messenger-spinner .messenger-spinner-side .messenger-spinner-fill { background: #dd6a45; -webkit-animation-duration: 600s; -moz-animation-duration: 600s; @@ -419,9 +404,9 @@ ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-later . opacity: 1; } /* line 45, ../../src/sass/messenger-spinner.scss */ -ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-later .messenger-spinner:after { +ul.messenger-theme-flat .messenger-message.alert-error.messenger-retry-later .messenger-spinner:after { content: ""; - background: #333333; + background: #292929; position: absolute; width: 26px; height: 26px; @@ -430,56 +415,41 @@ ul.messenger-theme-future .messenger-message.alert-error.messenger-retry-later . left: 3px; display: block; } -/* line 116, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message.alert-error .messenger-message-inner:before { - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dd6a45), color-stop(100%, #91361a)); - background-image: -webkit-linear-gradient(top, #dd6a45, #91361a); - background-image: -moz-linear-gradient(top, #dd6a45, #91361a); - background-image: -o-linear-gradient(top, #dd6a45, #91361a); - background-image: linear-gradient(top, #dd6a45, #91361a); - background-color: #dd6a45; -} -/* line 121, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message.alert-info .messenger-message-inner:before { - background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #61c4b8), color-stop(100%, #1992a3)); - background-image: -webkit-linear-gradient(top, #61c4b8, #1992a3); - background-image: -moz-linear-gradient(top, #61c4b8, #1992a3); - background-image: -o-linear-gradient(top, #61c4b8, #1992a3); - background-image: linear-gradient(top, #61c4b8, #1992a3); - background-color: #61c4b8; -} -/* line 127, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message-slot.last .messenger-message { +/* line 114, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message-slot.messenger-last .messenger-message { -webkit-border-radius: 4px 4px 0px 0px; -moz-border-radius: 4px 4px 0px 0px; -ms-border-radius: 4px 4px 0px 0px; -o-border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px; + -webkit-box-shadow: inset 48px 0px 0px #292929; + -moz-box-shadow: inset 48px 0px 0px #292929; + box-shadow: inset 48px 0px 0px #292929; } -/* line 130, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message-slot.first .messenger-message { +/* line 118, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message-slot.messenger-first .messenger-message { -webkit-border-radius: 0px 0px 4px 4px; -moz-border-radius: 0px 0px 4px 4px; -ms-border-radius: 0px 0px 4px 4px; -o-border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px; - -webkit-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - -moz-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); -} -/* line 134, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-message-slot.first.last .messenger-message { - -webkit-box-shadow: inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - -moz-box-shadow: inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); - box-shadow: inset 48px 0px 0px rgba(0, 0, 0, 0.3), inset 46px 0px 0px rgba(255, 255, 255, 0.07); + -webkit-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; + -moz-box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; + box-shadow: inset 0px 1px rgba(255, 255, 255, 0.13), inset 48px 0px 0px #292929; +} +/* line 122, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-message-slot.messenger-first.messenger-last .messenger-message { -webkit-border-radius: 4px; -moz-border-radius: 4px; -ms-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; + -webkit-box-shadow: inset 48px 0px 0px #292929; + -moz-box-shadow: inset 48px 0px 0px #292929; + box-shadow: inset 48px 0px 0px #292929; } -/* line 138, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future .messenger-spinner { +/* line 126, ../../src/sass/messenger-theme-flat.sass */ +ul.messenger-theme-flat .messenger-spinner { display: block; position: absolute; left: 7px; diff --git a/src/UI/Content/Overrides/bootstrap.less b/src/UI/Content/Overrides/bootstrap.less index ee2288be5..ac73020b5 100644 --- a/src/UI/Content/Overrides/bootstrap.less +++ b/src/UI/Content/Overrides/bootstrap.less @@ -1,48 +1,16 @@ @import "../prefixer"; +@import "../Bootstrap/variables"; +@import "../variables"; + +@input-border-focus: @droneTeal; +@font-family-sans-serif: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +@modal-md: 800px; +@modal-lg: 800px; .label, .badge, i { cursor : default; } -.input-group { - .input-group-addon { - margin-left : 0; - } -} - -.label, .badge, .btn { - .text-shadow(none); -} - -.btn { - - text-transform : capitalize; - min-width : 80px; - padding : 4px 12px; - - &.btn-xs { - min-width : 0px; - } - - &.btn-icon-only { - min-width : 41px; - } - - &.btn-icon-only-xs { - @media (max-width: @screen-xs-max) { - min-width : 41px; - - span { - .responsive-invisibility(); - } - } - } - - label, input { - padding: 0px; - } -} - .slide-button { min-width : 0px; } @@ -60,3 +28,47 @@ .tooltip-inner { word-wrap: break-word; } + +.dropdown-submenu { + position:relative; + & > .dropdown-menu { + top:0; + left:100%; + margin-top:-6px; + margin-left:-1px; + -webkit-border-radius:0 6px 6px 6px; + -moz-border-radius:0 6px 6px 6px; + border-radius:0 6px 6px 6px; + } + & > a:after { + display:block; + content:" "; + float:right; + width:0; + height:0; + border-color:transparent; + border-style:solid; + border-width:5px 0 5px 5px; + border-left-color:#cccccc; + margin-top:5px; + margin-right:-10px; + } +} +.dropdown-submenu:hover { + & > .dropdown-menu { + display:block; + } + & > a:after { + border-left-color:#ffffff; + } +} +.dropdown-submenu.pull-left { + float:none; + & > .dropdown-menu { + left:-100%; + margin-left:10px; + -webkit-border-radius:6px 0 6px 6px; + -moz-border-radius:6px 0 6px 6px; + border-radius:6px 0 6px 6px; + } +} diff --git a/src/UI/Content/Overrides/bootstrap.toggle-switch.less b/src/UI/Content/Overrides/bootstrap.toggle-switch.less index 6aad834d2..762656bb8 100644 --- a/src/UI/Content/Overrides/bootstrap.toggle-switch.less +++ b/src/UI/Content/Overrides/bootstrap.toggle-switch.less @@ -2,6 +2,9 @@ @import "Bootstrap/mixins"; .toggle { + height: 34px; + box-sizing: border-box; + .slide-button { .button-variant(@btn-danger-color, @btn-danger-bg, @btn-danger-border); diff --git a/src/UI/Content/Overrides/fullcalendar.less b/src/UI/Content/Overrides/fullcalendar.less index 3f7f29c30..d8f3accd9 100644 --- a/src/UI/Content/Overrides/fullcalendar.less +++ b/src/UI/Content/Overrides/fullcalendar.less @@ -8,4 +8,14 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; -} \ No newline at end of file +} + +@media (max-width: @screen-xs-max) { + .fc-button { + padding: 0px 5px; + } + + .fc-header-space { + padding-left: 5px; + } +} diff --git a/src/UI/Content/Overrides/messenger.less b/src/UI/Content/Overrides/messenger.less index dec17fe5a..160ed9512 100644 --- a/src/UI/Content/Overrides/messenger.less +++ b/src/UI/Content/Overrides/messenger.less @@ -1,5 +1,23 @@ +@import "../variables"; + body.control-panel-visible { ul.messenger.messenger-fixed.messenger-on-bottom { bottom: 95px; } +} + +ul.messenger-theme-flat .messenger-message.alert-info .messenger-message-inner:before { + background: @droneTeal; +} + +@media (max-width: @screen-xs-max) { + ul.messenger.messenger-fixed.messenger-on-bottom { + width: 100%; + bottom: 0px; + .border-bottom-radius(0); + + &.messenger-on-right { + right : 0px; + } + } } \ No newline at end of file diff --git a/src/UI/Content/bootstrap.less b/src/UI/Content/bootstrap.less new file mode 100644 index 000000000..d51ca8329 --- /dev/null +++ b/src/UI/Content/bootstrap.less @@ -0,0 +1,2 @@ +@import "./Bootstrap/bootstrap"; +@import "./Overrides/bootstrap"; \ No newline at end of file diff --git a/src/UI/Content/form.less b/src/UI/Content/form.less index 68e4c04d9..86ade923a 100644 --- a/src/UI/Content/form.less +++ b/src/UI/Content/form.less @@ -1,13 +1,7 @@ @import "../Shared/Styles/clickable.less"; .form-group { - .controls { - i { - font-size : 16px; - color : #595959; - margin-right : 5px; - } - + .input-group { .checkbox { width : 100px; margin-left : 0px; @@ -20,6 +14,7 @@ display : inline-block; margin-top : -20px; margin-bottom : 0; + margin-left : 10px; vertical-align : middle; } @@ -30,6 +25,22 @@ } } } + + i { + font-size : 16px; + color : #595959; + margin-right : 5px; + } + + .help-inline { + display : inline-block; + margin-top : 8px; + padding-left : 0px; + + @media (max-width: @screen-xs-max) { + margin-left: 0px; + } + } } .text-area-help { @@ -39,7 +50,12 @@ } textarea.release-restrictions { - width : 260px; + width : 100%; + max-width : 100%; +} + +.help-inline-text-area { + margin-top: 25px !important; } .help-link { @@ -58,3 +74,16 @@ h3 { text-transform: none; } } + +.form-inline { + div { + display : inline-block; + } +} + +.has-error { + .help-inline { + color: #b94a48; + margin-left: 0px; + } +} diff --git a/src/UI/Content/menu.less b/src/UI/Content/menu.less deleted file mode 100644 index 3b454b028..000000000 --- a/src/UI/Content/menu.less +++ /dev/null @@ -1,161 +0,0 @@ -@import "prefixer"; - -@grid-float-breakpoint: @screen-xs-min; - -#main-menu-region { - text-align : center; - margin-bottom : 10px; - - i:before { - font-size : 35px; - } - - i { - width : 40px; - } - - .navbar-nav, .navbar-nav>li { - float : none; - } - - .navbar-brand { - padding : 0px; - } - - .logo { - margin-top : 25px; - vertical-align : middle; - height : 70px; - width : 70px; - - color: #ff0000; - &:after { - content: "unknown"; - } - - @media (min-width: @screen-xs-min) { - &:after { - content: "xs"; - } - } - - @media (min-width: @screen-sm-min) { - &:after { - content: "sm"; - } - } - - @media (min-width: @screen-md-min) { - &:after { - content: "md"; - } - } - - @media (min-width: @screen-lg-min) { - &:after { - content: "lg"; - } - } - } - - li { - list-style-type : none; - display : inline-block; - position : relative; - - a { - - &:focus { - text-decoration : none; - } - - display : block; - - @media (max-width: @screen-xs-max) { - border-radius : 6px; - padding : 15px 10px 5px; - min-height : 38px; - min-width : 42px; - margin : 20px 0px 5px; - } - - @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { - border-radius : 6px; - padding : 15px 10px 5px; - min-height : 76px; - min-width : 84px; - margin : 20px 0px 5px; - } - - @media (min-width: @screen-md-min) { - border-radius : 6px; - padding : 15px 10px 5px; - min-height : 76px; - min-width : 84px; - margin : 20px 10px 5px; - } - - color : #b9b9b9; - font-weight : 100; - } - span.label.pull-right { - position : absolute; - top : 28px; - right : 18px; - } - } -} - -.backdrop { - #nav-region { - background-color : #000000; - .opacity(0.85); - } - - -} - -#nav-region { - margin-bottom : 80px; - height : 150px; - - .col-md-12 { - margin-left : 0px; - } - - li { - a { - &:hover { - background-color : #555555; - text-decoration : none; - } - - .label { - cursor: pointer; - } - } - } -} - -.search { - text-align: center; - - input, .input-group-addon { - background-color: #333333; - border-color: #333333; - color: #cccccc; - } - - ul { - text-align: left; - } - - .dropdown-menu { - background-color: #333333; - color: #cccccc; - - > li > a { - color: #cccccc; - } - } -} \ No newline at end of file diff --git a/src/UI/Content/navbar.less b/src/UI/Content/navbar.less new file mode 100644 index 000000000..6e89a6526 --- /dev/null +++ b/src/UI/Content/navbar.less @@ -0,0 +1,227 @@ +@import "prefixer"; +@import "variables"; + +@grid-float-breakpoint: @screen-xs-min; + +.backdrop { + .navbar-nzbdrone { + background-color : #000000; + .opacity(0.85); + padding-bottom: 10px; + } +} + +.navbar-nzbdrone { + text-align : center; + + i:before { + font-size : 35px; + display: block; + } + + .navbar-nav, .navbar-nav>li { + float : none; + } + + .navbar-toggle { + border-color: #333; + + &:hover, + &:focus { + background-color: #333; + } + + .icon-bar { + background-color: #ffffff; + } + } + + .navbar-brand { + position: absolute; + + @media (max-width: @screen-xs-max) { + padding: 9px 15px; + font-size: 14px; + } + + @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { + padding: 20px 15px; + } + + @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { + padding: 30px 15px; + } + + @media (min-width: @screen-lg-min) { + padding: 22px 15px; + } + } + + .logo-text { + color: white; + font-weight: 300; + + .highlight { + font-weight: 400; + color: @droneTeal; + } + } + + li { + list-style-type : none; + display : inline-block; + position : relative; + + a { + display : block; + color : #b9b9b9; + font-weight : 100; + + &:hover { + background-color : #555555; + text-decoration : none; + } + + .label { + cursor: pointer; + } + + &:focus { + text-decoration : none; + } + + @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { + border-radius : 6px; + padding : 5px 0px 5px; + min-height : 76px; + min-width : 64px; + margin : 20px 5px 5px; + } + + @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { + border-radius : 6px; + padding : 15px 10px 5px; + min-height : 76px; + min-width : 64px; + margin : 20px 10px 5px; + } + + @media (min-width: @screen-lg-min) { + border-radius : 6px; + padding : 15px 10px 5px; + min-height : 76px; + min-width : 84px; + margin : 20px 10px 5px; + } + } + + .health { + .label { + position : absolute; + top : 10px; + right : 10px; + } + } + } + + @media (max-width: @screen-xs-max) { + text-align : left; + + i:before { + font-size : 14px; + display: inline-block; + } + + li { + display: block; + + a:hover { + background-color: transparent; + } + + .health { + margin-left: 5px; + + .label { + position : static; + } + } + } + } +} + +.search { + + i:before { + font-size: 14px; + } + + .input-group { + input, .input-group-addon { + background-color: #333333; + } + } + + input, .input-group-addon { + border-color: #333333; + color: #cccccc; + } + + ul { + text-align: left; + } + + .tt-dropdown-menu { + + background-color: #333333; + color: #cccccc; + opacity: .95; + + .tt-suggestion { + color: #cccccc; + + &.tt-cursor { + //item selected + + background-color: @droneTeal; + color: #222222; + + a { + //link in item selected + color: #222222; + } + } + } + } +} + +//.screen-size { +// color: @droneTeal; +// &:after { +// content: "unknown"; +// } +// +// @media (min-width: @screen-xs-min) { +// &:after { +// content: "xs"; +// } +// } +// +// @media (min-width: @screen-sm-min) { +// &:after { +// content: "sm"; +// } +// } +// +// @media (min-width: @screen-md-min) { +// &:after { +// content: "md"; +// } +// } +// +// @media (min-width: @screen-lg-min) { +// &:after { +// content: "lg"; +// } +// } +//} diff --git a/src/UI/Content/progress-bars.less b/src/UI/Content/progress-bars.less index f8e603004..6d4e0911f 100644 --- a/src/UI/Content/progress-bars.less +++ b/src/UI/Content/progress-bars.less @@ -11,15 +11,16 @@ } .progressbar-back-text, .progressbar-front-text { - font-size : 11.844px; + font-size : 12px; font-weight : bold; text-align : center; cursor : default; + line-height : 20px; } .progressbar-back-text { - position : absolute; - height : 100%; + position : absolute; + height : 100%; } .progressbar-front-text { @@ -27,7 +28,7 @@ height : 100%; } - .bar { + .progress-bar { position : absolute; overflow : hidden; } diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less index 71cea645a..47a0b323f 100644 --- a/src/UI/Content/theme.less +++ b/src/UI/Content/theme.less @@ -3,7 +3,7 @@ @import "Bootstrap/type"; @import "font"; @import "form"; -@import "menu"; +@import "navbar"; @import "Backgrid/backgrid"; @import "prefixer"; @import "icons"; @@ -14,6 +14,15 @@ @import "../Shared/Styles/clickable"; @import "../Shared/Styles/card"; @import "../Rename/rename"; +@import "typeahead"; +@import "utilities"; + +.main-region { + @media (min-width: @screen-lg-min) { + padding-left : 30px; + padding-right : 30px; + } +} .toolbar { @@ -150,8 +159,9 @@ body { min-width : 1210px; */ max-width : 1210px; margin : auto; - margin-top : -70px; +// margin-top : -70px; padding : 20px 0px; + .header { padding-bottom : 10px; margin-bottom : 20px; @@ -186,12 +196,6 @@ body { color : @state-danger-text; } -.form-inline { - div { - display : inline-block; - } -} - .error { background: #FF0000; } @@ -219,6 +223,17 @@ body { left: 0; bottom: 0; width: 100%; - height: 55px; + height: 80px; opacity: 0; + + @media (max-width: @screen-sm-max) { + height: initial; + position: static; + } +} + +.tab-content { + .tab-pane { + padding-top: 10px; + } } diff --git a/src/UI/Content/typeahead.less b/src/UI/Content/typeahead.less new file mode 100644 index 000000000..5a901c3ee --- /dev/null +++ b/src/UI/Content/typeahead.less @@ -0,0 +1,152 @@ +/* + * typehead.js-bootstrap3.less + * @version 0.2.3 + * https://github.com/hyspace/typeahead.js-bootstrap3.less + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +//custom mixin for .form-control-validation +.typeahead-form-control(@border-color: #ccc;) { + border-color: @border-color; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + &:focus { + border-color: darken(@border-color, 10%); + @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); + .box-shadow(@shadow); + } +} + +//main styles for control +.tt-input, +.tt-hint { + .twitter-typeahead &{ + //validation states + .has-warning &{ + .typeahead-form-control(@state-warning-text); + } + .has-error &{ + .typeahead-form-control(@state-danger-text); + } + .has-success &{ + .typeahead-form-control(@state-success-text); + } + } + + //border + .input-group .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-base); + } + .input-group .twitter-typeahead:last-child &{ + .border-right-radius(@border-radius-base); + } + + //sizing - small:size and border + .input-group.input-group-sm .twitter-typeahead &{ + .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); + } + .input-group.input-group-sm .twitter-typeahead:not(:first-child):not(:last-child) &{ + border-radius: 0; + } + .input-group.input-group-sm .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-small); + .border-right-radius(0); + } + .input-group.input-group-sm .twitter-typeahead:last-child &{ + .border-left-radius(0); + .border-right-radius(@border-radius-small); + } + + //sizing - large:size and border + .input-group.input-group-lg .twitter-typeahead &{ + .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); + } + .input-group.input-group-lg .twitter-typeahead:not(:first-child):not(:last-child) &{ + border-radius: 0; + } + .input-group.input-group-lg .twitter-typeahead:first-child &{ + .border-left-radius(@border-radius-large); + .border-right-radius(0); + } + .input-group.input-group-lg .twitter-typeahead:last-child &{ + .border-left-radius(0); + .border-right-radius(@border-radius-large); + } +} + +//for wrapper +.twitter-typeahead { + width: 100%; + .input-group &{ + //overwrite `display:inline-block` style + display: table-cell!important; + float: left; + } +} + +//particular style for each other +.twitter-typeahead .tt-hint { + color: @text-muted;//color - hint +} +.twitter-typeahead .tt-input { + z-index: 2; + //disabled status + //overwrite inline styles of .tt-query + &[disabled], + &[readonly], + fieldset[disabled] & { + cursor: not-allowed; + //overwirte inline style + background-color: @input-bg-disabled!important; + } +} + +//dropdown styles +.tt-dropdown-menu { + //dropdown menu + position: absolute; + top: 100%; + left: 0; + z-index: @zindex-dropdown; + min-width: 160px; + width: 100%; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + font-size: @font-size-base; + background-color: @dropdown-bg; + border: 1px solid @dropdown-fallback-border; + border: 1px solid @dropdown-border; + border-radius: @border-radius-base; + .box-shadow(0 6px 12px rgba(0,0,0,.175)); + background-clip: padding-box; + *border-right-width: 2px; + *border-bottom-width: 2px; + + .tt-suggestion { + //item + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: @line-height-base; + color: @dropdown-link-color; + white-space: nowrap; + + &.tt-cursor { + //item selected + text-decoration: none; + outline: 0; + background-color: @dropdown-link-hover-bg; + color: @dropdown-link-hover-color; + a { + //link in item selected + color: @dropdown-link-hover-color; + } + } + p { + margin: 0; + } + } +} diff --git a/src/UI/Content/utilities.less b/src/UI/Content/utilities.less new file mode 100644 index 000000000..cc2f2cc75 --- /dev/null +++ b/src/UI/Content/utilities.less @@ -0,0 +1,19 @@ +@import "Bootstrap/variables"; +@import "Bootstrap/mixins"; + +@media (max-width: @screen-sm-max) { + .pull-none-xs { + float : none !important; + } + + .btn-group { + &.btn-group-collapse { + > .btn { + margin : 2px; + display : block; + float : none; + border-radius : @border-radius-base !important; + } + } + } +} \ No newline at end of file diff --git a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.html b/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.html index 459032937..7f2818c53 100644 --- a/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.html +++ b/src/UI/Episode/Activity/EpisodeActivityLayoutTemplate.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/src/UI/Episode/EpisodeDetailsLayoutTemplate.html b/src/UI/Episode/EpisodeDetailsLayoutTemplate.html index 33a0c5514..9a8036be5 100644 --- a/src/UI/Episode/EpisodeDetailsLayoutTemplate.html +++ b/src/UI/Episode/EpisodeDetailsLayoutTemplate.html @@ -1,33 +1,37 @@ -
-
- +
+
+
+
+ -

- - {{series.title}} - {{EpisodeNumber}} - {{title}} -

+

+ + {{series.title}} - {{EpisodeNumber}} - {{title}} +

-
-
- -
-
-
- -
-
- {{#unless hideSeriesLink}} - {{#with series}} - open series - {{/with}} - {{/unless}} +
+
+ +
+
+
+ +
+
+ {{#unless hideSeriesLink}} + {{#with series}} + open series + {{/with}} + {{/unless}} - + +
+
diff --git a/src/UI/Episode/Search/ManualLayoutTemplate.html b/src/UI/Episode/Search/ManualLayoutTemplate.html index 84945e3bb..9238c1959 100644 --- a/src/UI/Episode/Search/ManualLayoutTemplate.html +++ b/src/UI/Episode/Search/ManualLayoutTemplate.html @@ -1,2 +1,2 @@ -
+
\ No newline at end of file diff --git a/src/UI/Form/CheckboxTemplate.html b/src/UI/Form/CheckboxTemplate.html index b25984c91..1da8fa23f 100644 --- a/src/UI/Form/CheckboxTemplate.html +++ b/src/UI/Form/CheckboxTemplate.html @@ -1,21 +1,23 @@
- + -
-