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}} - {{/unless}} - - {{> 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 000000000..ae8cf56c7 Binary files /dev/null and b/src/UI/Content/Images/logos/128.png differ diff --git a/src/UI/Content/Images/logos/32.png b/src/UI/Content/Images/logos/32.png new file mode 100644 index 000000000..a079d7afc Binary files /dev/null and b/src/UI/Content/Images/logos/32.png differ diff --git a/src/UI/Content/Images/logos/48.png b/src/UI/Content/Images/logos/48.png new file mode 100644 index 000000000..b4a009323 Binary files /dev/null and b/src/UI/Content/Images/logos/48.png differ 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); + -moz-user-select: none; + -webkit-user-select: none; + -o-user-select: none; + user-select: none; + background: #404040; } -/* line 24, ../../src/sass/messenger-theme-future.sass */ -ul.messenger-theme-future.messenger-empty { +/* 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); + -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 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); +/* 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 @@
- + -
-