diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index cbde5969b6..5dfb3cdddd 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 211bfb1eea..41a4fac79a 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -238,11 +238,6 @@ height: 100%; } - .cardImage canvas { - width: 100%; - height: 100%; - } - .coveredCardImage { background-size: cover; } diff --git a/dashboard-ui/css/icons.css b/dashboard-ui/css/icons.css index 4739609e54..25c47abc1a 100644 --- a/dashboard-ui/css/icons.css +++ b/dashboard-ui/css/icons.css @@ -114,14 +114,6 @@ background-image: url("images/icons/subtitles.png"); } -.ui-icon-wireless:after { - background-image: url("images/icons/wireless.png"); -} -/* Fallback */ -.ui-nosvg .ui-icon-wireless:after { - background-image: url("images/icons/wireless.png"); -} - .ui-icon-expand:after { background-image: url("data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3C!DOCTYPE%20svg%20PUBLIC%20%22-%2F%2FW3C%2F%2FDTD%20SVG%201.1%20Tiny%2F%2FEN%22%20%22http%3A%2F%2Fwww.w3.org%2FGraphics%2FSVG%2F1.1%2FDTD%2Fsvg11-tiny.dtd%22%3E%3Csvg%20version%3D%221.1%22%20baseProfile%3D%22tiny%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2216px%22%20height%3D%2216px%22%20viewBox%3D%220%200%20500%20500%22%20xml%3Aspace%3D%22preserve%22%3E%20%3Cpath%20d%3D%22M210.659%20294.643q0%203.627-2.79%206.417l-92.634%2092.634%2040.179%2040.179q5.301%205.301%205.301%2012.556t-5.301%2012.556-12.556%205.301h-125q-7.254%200-12.556-5.301t-5.301-12.556v-125q0-7.254%205.301-12.556t12.556-5.301%2012.556%205.301l40.179%2040.179%2092.634-92.634q2.79-2.79%206.417-2.79t6.417%202.79l31.808%2031.808q2.79%202.79%202.79%206.417zM428.571%2053.571v125q0%207.254-5.301%2012.556t-12.556%205.301-12.556-5.301l-40.179-40.179-92.634%2092.634q-2.79%202.79-6.417%202.79t-6.417-2.79l-31.808-31.808q-2.79-2.79-2.79-6.417t2.79-6.417l92.634-92.634-40.179-40.179q-5.301-5.301-5.301-12.556t5.301-12.556%2012.556-5.301h125q7.254%200%2012.556%205.301t5.301%2012.556z%22%20fill%3D%22%23ffffff%22%20%2F%3E%3C%2Fsvg%3E"); background-repeat: no-repeat; diff --git a/dashboard-ui/css/images/icons/wireless.png b/dashboard-ui/css/images/icons/wireless.png deleted file mode 100644 index d1e274ae34..0000000000 Binary files a/dashboard-ui/css/images/icons/wireless.png and /dev/null differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 11d67dcb4d..30c541b4ea 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1443,14 +1443,14 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .userProfileSettingsForm .detailSectionContent { - padding: 0 1em; + padding: 0 .5em; } @media all and (max-width: 700px) { .userProfileSettingsForm .detailSection { - margin-left: 1em; - margin-right: 1em; + margin-left: .5em; + margin-right: .5em; } } @@ -1505,3 +1505,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .homeLatestTabDisabled .homeLatestTab { display: none !important; } +.movieTrailersTabDisabled .movieTrailersTab { + display: none !important; +} \ No newline at end of file diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 4e4500511f..990ea56318 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -1,9 +1,9 @@ .libraryPage { - padding-top: 49px !important; + padding-top: 50px !important; } .libraryPage:not(.metadataEditorPage):not(.noSecondaryNavPage) { - padding-top: 99px !important; + padding-top: 98px !important; } .libraryMenuDivider { @@ -118,9 +118,7 @@ left: 0; z-index: 999; top: 0; - border-top: 0; - border-left: 0; - border-right: 0; + border: 0; } .libraryViewNav { @@ -133,6 +131,7 @@ z-index: 999; text-align: center; font-size: 14px; + text-transform: uppercase; white-space: nowrap; padding: 0 0 0; overflow-x: scroll; @@ -141,6 +140,13 @@ -webkit-overflow-scrolling: touch; } +.bottomLibraryViewNav { + top: initial; + bottom: 0; + border-top: 1px solid #444; + height: 51px; +} + .viewMenuBar { background-color: #111; } @@ -232,9 +238,13 @@ border-bottom: 5px solid transparent; } - .libraryViewNav a:not(.ui-btn-active):hover { - color: #2ad !important; - } +.bottomLibraryViewNav a { + padding: 12px 0 12px; +} + +.libraryViewNav a:not(.ui-btn-active):hover { + color: #2ad !important; +} .libraryViewNavLinkContent { display: inline-block; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 9b98020ae4..873250265d 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -176,7 +176,7 @@ h1 a:hover { transform: translateY(0%); } -.headroom--unpinned { +.headroom--unpinned:not(.headroomDisabled) { -webkit-transform: translateY(-100%); transform: translateY(-100%); } @@ -613,9 +613,9 @@ h1 .imageLink { /* Footer */ #footer { position: fixed; - bottom: -2px; - left: -2px; - right: -2px; + bottom: 0; + left: 0; + right: 0; /* Above everything, except for the video player and popup overlays */ z-index: 1097; color: #fff; @@ -623,6 +623,10 @@ h1 .imageLink { background-color: rgba(26,26,26,.9); } +.footerOverBottomTabs { + bottom: 50px; +} + .footerNotification { padding: .75em 1em; margin: 0; diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 0d661aa8df..b0c0e62ba3 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -10,7 +10,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} @@ -21,7 +21,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} @@ -32,7 +32,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 62b3343721..a138b34758 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -33,7 +33,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html index 0b760aaba4..2b4fcdd946 100644 --- a/dashboard-ui/moviegenres.html +++ b/dashboard-ui/moviegenres.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html index 1b39a43be9..b04ce589f5 100644 --- a/dashboard-ui/moviepeople.html +++ b/dashboard-ui/moviepeople.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 03d573495c..f41e13dada 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html index c5bf0def02..c313e6bafd 100644 --- a/dashboard-ui/moviesrecommended.html +++ b/dashboard-ui/moviesrecommended.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index 2d3436bbff..dffa8dd012 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -9,7 +9,7 @@
${TabSuggestions} ${TabMovies} - ${TabTrailers} + ${TabTrailers} ${TabCollections} ${TabGenres} ${TabPeople} diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html index ca71b5352b..b8db74f553 100644 --- a/dashboard-ui/mypreferencesdisplay.html +++ b/dashboard-ui/mypreferencesdisplay.html @@ -13,142 +13,144 @@ ${TabAppSettings}
-
-
+
+
+ -
-
- ${HeaderMyViews} -
-
-
-

${LabelSelectFolderGroups}

-
-
${LabelSelectFolderGroupsHelp}
+
+
+ ${HeaderMyViews}
-
- -
-
- - -
-
${LabelDisplayCollectionsViewHelp}
-
- -
-
- - -
- -
-
-

${HeaderChannels}

+
-

${LabelGroupChannelsIntoViews}

-
-
${LabelGroupChannelsIntoViewsHelp}
+

${LabelSelectFolderGroups}

+
+
${LabelSelectFolderGroupsHelp}
-
-
-
+
- - -
-
- ${HeaderViewOrder} -
-
-

${LabelSelectUserViewOrder}

-
- -
-
- -
- -
-
- ${HeaderLatestItems} -
-
-

${LabelSelectLastestItemsFolders}

-
- -
- -
-
- - -
-
- -
- -
-
- ${HeaderOtherDisplaySettings} -
-
-
-
- - +
+ + +
+
${LabelDisplayCollectionsViewHelp}
-
- - -
-
-
-
+ +
- - + +
-
${LabelDisplayTrailersWithinMovieSuggestionsHelp}
-
-
-
-
- - + +
+
+

${HeaderChannels}

+
+

${LabelGroupChannelsIntoViews}

+
+
${LabelGroupChannelsIntoViewsHelp}
+
-
${LabelGroupMoviesIntoCollectionsHelp}
-
+ + +
+
+ ${HeaderViewOrder} +
+
+

${LabelSelectUserViewOrder}

+
+ +
+
+ +
+ +
+
+ ${HeaderLatestItems} +
+
+

${LabelSelectLastestItemsFolders}

+
+ +
+ +
+
+ + +
+
+ +
+ +
+
+ ${HeaderOtherDisplaySettings} +
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+ + +
+
${LabelDisplayTrailersWithinMovieSuggestionsHelp}
+
+
+
+
+ + +
+
${LabelGroupMoviesIntoCollectionsHelp}
+
+
+ +
+ +
    +
  • + + +
    • +
+ + +
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html index d95a57ee16..730edaa9d8 100644 --- a/dashboard-ui/mypreferenceslanguages.html +++ b/dashboard-ui/mypreferenceslanguages.html @@ -12,78 +12,80 @@ ${TabProfile} ${TabAppSettings}
+
-
-
+
+ -
-
- ${HeaderLanguagePreferences} +
+
+ ${HeaderLanguagePreferences} +
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + + + + + +
+
+
-
-
-
- - + - - -
    -
  • - - -
    • -
- - +
    +
  • + + +
    • +
+ + +
\ No newline at end of file diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html index 52b1d50422..20e6e250d7 100644 --- a/dashboard-ui/mypreferenceswebclient.html +++ b/dashboard-ui/mypreferenceswebclient.html @@ -13,188 +13,190 @@ ${TabAppSettings}
-
-
+
+
+ -
-
- ${HeaderHomePage} + -
-
-
- - +
+
+ ${HeaderSettingsForThisDevice}
-
-
- - -
-
-
- - -
-
-
- - -
-
-
- - -
${LabelShowLibraryTileNamesHelp}
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
${LabelEnableThemeSongsHelp}
+
+
+ + +
+
+
+ ${LabelExternalPlayers} + + + +
+
${LabelExternalPlayersHelp}
+
-
-
-
- ${HeaderSettingsForThisDevice} -
-
-
-
- - -
-
-
- - -
-
-
- - -
${LabelEnableThemeSongsHelp}
-
-
- - -
-
-
- ${LabelExternalPlayers} - - - -
-
${LabelExternalPlayersHelp}
-
-
-
- -
    -
  • - - -
    • -
- +
    +
  • + + +
    • +
+ +
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html index 7ebb8f4185..14a0166dbc 100644 --- a/dashboard-ui/myprofile.html +++ b/dashboard-ui/myprofile.html @@ -13,116 +13,117 @@ ${TabAppSettings}
-
-
-
+
+
+
+
-
-

- +
+

+ +
-
- + -