diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index d33071b75f..518def10ba 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -10,8 +10,6 @@

${HeaderChannels}

-
-
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index e3d8dcde56..a79611e0a9 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -18,6 +18,7 @@
+  
diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css index 5bc058f096..a79759b8c9 100644 --- a/dashboard-ui/css/detailtable.css +++ b/dashboard-ui/css/detailtable.css @@ -1,8 +1,6 @@ .detailTableContainer { width: 100%; - max-width: 1050px; text-align: center; - margin: 0 auto; } .detailTable { diff --git a/dashboard-ui/css/images/items/folders/musicvideos.png b/dashboard-ui/css/images/items/folders/musicvideos.png new file mode 100644 index 0000000000..a5c6251766 Binary files /dev/null and b/dashboard-ui/css/images/items/folders/musicvideos.png differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index e6ca05bdfd..07e2e9134b 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -32,8 +32,6 @@ } .ehsContent { - max-width: 640px; - margin: 0 auto; padding: 0; border-spacing: 0; border-collapse: collapse; @@ -57,7 +55,6 @@ } .viewSettings { - text-align: center; margin: 0 0 .25em; } @@ -332,7 +329,7 @@ a.itemTag:hover { } .lnkPreviousItem { - left: 5px; + left: 210px; } .lnkNextItem { @@ -611,26 +608,8 @@ a.itemTag:hover { } } -@media all and (min-width: 800px) { - - .ehsContent { - max-width: 700px; - } -} - -@media all and (min-width: 900px) { - - .ehsContent { - max-width: 880px; - } -} - @media all and (min-width: 1000px) { - .ehsContent { - max-width: 880px; - } - .detailPageContent { max-width: 900px; } @@ -642,10 +621,6 @@ a.itemTag:hover { @media all and (min-width: 1200px) { - .ehsContent { - max-width: 950px; - } - .detailPageContent { max-width: 930px; } @@ -655,13 +630,6 @@ a.itemTag:hover { } } -@media all and (min-width: 1440px) { - - .ehsContent { - max-width: 1240px; - } -} - .detailPageParentLink { text-decoration: none; } @@ -797,10 +765,6 @@ a.itemTag:hover { } } -.itemsContainer { - text-align: center; -} - @media all and (min-width: 1200px) { .scenePosterViewItem img { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index d54208b213..a03a5a8e3a 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -122,6 +122,20 @@ background-position: 8px center; } +.musicvideosViewMenu { + background-image: url(images/items/folders/musicvideos.png); + background-repeat: no-repeat; + background-size: 18px 18px; + background-position: 8px 8px; +} + +.photosViewMenu { + background-image: url(images/items/folders/photos.png); + background-repeat: no-repeat; + background-size: 18px 18px; + background-position: 8px 8px; +} + .collectionsViewMenu, .generalViewMenu, .homeVideosViewMenu { background-image: url(images/items/folders/homevideos.png); background-repeat: no-repeat; @@ -155,7 +169,7 @@ } .libraryViewNavInner { - text-align: center; + text-align: left; font-size: 14px; white-space: nowrap; padding: 0 0 0; @@ -185,7 +199,7 @@ .libraryViewNavLinkContent { border-bottom: 5px solid transparent; display: inline-block; - padding: 0 .9em 7px; + padding: 0 1em 7px; color: #ddd; } @@ -200,7 +214,7 @@ vertical-align: middle; } -@media all and (min-width: 1280px) { +@media all and (min-width: 1279px) { .libraryMenuButton { display: none; @@ -212,11 +226,16 @@ right: 0 !important; } - .libraryPage:not(.itemDetailPage) .libraryViewNav { + .libraryPage .libraryViewNav { + padding-left: 232px !important; + } + + .viewSettings { + padding-left: .4em; } } -@media all and (max-width: 1280px) { +@media all and (max-width: 1278px) { .desktopHomeLink { display: none; @@ -229,6 +248,14 @@ .desktopLibraryMenu { display: none; } + + .viewSettings { + text-align: center; + } + + .itemsContainer { + text-align: center; + } } @media all and (min-width: 750px) { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index cb7ae804f4..e3b5d544e2 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -69,8 +69,8 @@ body { text-decoration: underline; } -h1 { - font-weight: 100; +h1, h1 a { + font-weight: 100!important; font-size: 28px; font-family: Roboto; } @@ -85,7 +85,6 @@ h2 { } h1 a { - font-weight: 300!important; text-decoration: none; } diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 7cfb4bc074..4049eb2961 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -155,7 +155,7 @@
-
+
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html index f967dc804c..d9bfe4a356 100644 --- a/dashboard-ui/livetvguide.html +++ b/dashboard-ui/livetvguide.html @@ -16,7 +16,7 @@
-
+
@@ -26,8 +26,8 @@
-
-
+
+
 
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js index 3ad0d4d5ee..456aa497ae 100644 --- a/dashboard-ui/scripts/channels.js +++ b/dashboard-ui/scripts/channels.js @@ -19,8 +19,6 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); - updateFilterControls(page); html = LibraryBrowser.getPosterViewHtml({ @@ -34,22 +32,6 @@ $('#items', page).html(html).trigger('create').createPosterItemMenus(); - $('.btnNextPage', page).on('click', function () { - query.StartIndex += query.Limit; - reloadItems(page); - }); - - $('.btnPreviousPage', page).on('click', function () { - query.StartIndex -= query.Limit; - reloadItems(page); - }); - - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues('channels', query); Dashboard.hideLoadingMsg(); @@ -62,14 +44,6 @@ $(document).on('pagebeforeshow', "#channelsPage", function () { - var limit = LibraryBrowser.getDefaultPageSize(); - - // If the default page size has changed, the start index will have to be reset - if (limit != query.Limit) { - query.Limit = limit; - query.StartIndex = 0; - } - LibraryBrowser.loadSavedQueryValues('channels', query); reloadItems(this); diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index d40cf01290..3f6001b6fe 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -61,7 +61,7 @@ SortBy: "DateCreated", SortOrder: "Descending", - Limit: screenWidth >= 1920 ? 12 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 12 : 12)), + Limit: screenWidth >= 1920 ? 10 : (screenWidth >= 1440 ? 8 : (screenWidth >= 800 ? 8 : 8)), Recursive: true, Fields: "PrimaryImageAspectRatio", Filters: "IsUnplayed,IsNotFolder",