From 9b452f3b5360eb2966b98b7b08186517591fd070 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 23 Jan 2015 01:15:15 -0500 Subject: [PATCH] sync updates --- dashboard-ui/channelitems.html | 2 +- dashboard-ui/channels.html | 2 +- dashboard-ui/collections.html | 2 +- dashboard-ui/css/card.css | 117 ++---------------- dashboard-ui/css/librarybrowser.css | 26 ++-- dashboard-ui/css/notifications.css | 45 ++++++- dashboard-ui/dashboardhosting.html | 8 ++ dashboard-ui/episodes.html | 2 +- dashboard-ui/gamesrecommended.html | 2 +- dashboard-ui/livetvchannel.html | 2 +- dashboard-ui/livetvsuggested.html | 4 +- dashboard-ui/moviegenres.html | 2 +- dashboard-ui/moviepeople.html | 2 +- dashboard-ui/movies.html | 2 +- dashboard-ui/movieslatest.html | 2 +- dashboard-ui/moviesrecommended.html | 2 +- dashboard-ui/moviestudios.html | 2 +- dashboard-ui/movietrailers.html | 2 +- dashboard-ui/musicalbumartists.html | 2 +- dashboard-ui/musicalbums.html | 2 +- dashboard-ui/musicartists.html | 2 +- dashboard-ui/musicgenres.html | 2 +- dashboard-ui/musicrecommended.html | 2 +- dashboard-ui/musicvideos.html | 2 +- dashboard-ui/playlists.html | 2 +- dashboard-ui/scripts/channelitems.js | 10 +- dashboard-ui/scripts/channels.js | 2 +- dashboard-ui/scripts/dashboardhosting.js | 23 ++++ dashboard-ui/scripts/editorsidebar.js | 3 +- dashboard-ui/scripts/episodes.js | 14 ++- dashboard-ui/scripts/favorites.js | 11 +- dashboard-ui/scripts/gamegenrepage.js | 10 +- dashboard-ui/scripts/gamespage.js | 16 +-- dashboard-ui/scripts/gamesrecommendedpage.js | 4 +- dashboard-ui/scripts/gamestudiospage.js | 10 +- dashboard-ui/scripts/gamesystemspage.js | 30 +---- dashboard-ui/scripts/indexpage.js | 35 +++--- dashboard-ui/scripts/itembynamedetailpage.js | 2 +- dashboard-ui/scripts/itemdetailpage.js | 10 +- dashboard-ui/scripts/itemlistpage.js | 9 +- dashboard-ui/scripts/librarybrowser.js | 24 ++-- dashboard-ui/scripts/librarylist.js | 37 +++--- dashboard-ui/scripts/librarymenu.js | 2 +- dashboard-ui/scripts/livetvchannels.js | 10 +- dashboard-ui/scripts/livetvrecordinglist.js | 2 +- dashboard-ui/scripts/livetvrecordings.js | 2 +- dashboard-ui/scripts/livetvseriestimer.js | 2 +- dashboard-ui/scripts/livetvsuggested.js | 10 +- dashboard-ui/scripts/moviecollections.js | 28 ++--- dashboard-ui/scripts/moviegenres.js | 13 +- dashboard-ui/scripts/moviepeople.js | 10 +- dashboard-ui/scripts/movies.js | 21 ++-- dashboard-ui/scripts/movieslatest.js | 4 +- dashboard-ui/scripts/moviesrecommended.js | 16 ++- dashboard-ui/scripts/moviestudios.js | 8 +- dashboard-ui/scripts/movietrailers.js | 12 +- dashboard-ui/scripts/musicalbumartists.js | 15 +-- dashboard-ui/scripts/musicalbums.js | 36 ++++-- dashboard-ui/scripts/musicartists.js | 11 +- dashboard-ui/scripts/musicgenres.js | 10 +- dashboard-ui/scripts/musicrecommended.js | 15 ++- dashboard-ui/scripts/musicvideos.js | 8 +- dashboard-ui/scripts/playlistedit.js | 9 +- dashboard-ui/scripts/playlistmanager.js | 25 ---- dashboard-ui/scripts/playlists.js | 15 ++- dashboard-ui/scripts/search.js | 19 ++- dashboard-ui/scripts/songs.js | 9 +- dashboard-ui/scripts/syncactivity.js | 2 + dashboard-ui/scripts/syncjob.js | 6 + dashboard-ui/scripts/tvgenres.js | 13 +- dashboard-ui/scripts/tvlatest.js | 4 +- dashboard-ui/scripts/tvpeople.js | 10 +- dashboard-ui/scripts/tvrecommended.js | 17 ++- dashboard-ui/scripts/tvshows.js | 20 ++- dashboard-ui/scripts/tvstudios.js | 10 +- dashboard-ui/scripts/tvupcoming.js | 4 +- dashboard-ui/scripts/userlibraryaccess.js | 16 ++- .../thirdparty/jquery.unveil-custom.js | 6 + dashboard-ui/tvgenres.html | 2 +- dashboard-ui/tvlatest.html | 2 +- dashboard-ui/tvpeople.html | 2 +- dashboard-ui/tvrecommended.html | 4 +- dashboard-ui/tvshows.html | 2 +- dashboard-ui/tvstudios.html | 2 +- dashboard-ui/tvupcoming.html | 2 +- 85 files changed, 421 insertions(+), 505 deletions(-) diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index 1a85770ac5..45cd31e300 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -21,7 +21,7 @@
-
+
diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index d83a2e42a7..fffcecb670 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -14,7 +14,7 @@
-
+
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index 2a1c4cc6b1..aa6558812a 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -30,7 +30,7 @@  
-
+
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 80d3480fad..b078bcf53c 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -45,7 +45,7 @@ } .cardBox { - margin: 3px; + margin: 2px; } .grayscale { @@ -82,6 +82,10 @@ background: #fff; } +/*.visualCardBox .cardFooter { + padding: 0 2px; +}*/ + .ui-page-theme-b .visualCardBox { background: rgb(51, 51, 51); border: 1px solid rgb(31, 31, 31); @@ -364,10 +368,6 @@ width: 12.5%; } - .backdropCard { - width: 16.666666666666666666666666666667%; - } - .portraitCard { width: 10%; } @@ -395,9 +395,13 @@ .bannerCard { width: 25%; } +} - .portraitCard { - width: 9.0909090909090909090909090909091%; + +@media all and (min-width: 2200px) { + + .backdropCard { + width: 16.666666666666666666666666666667%; } } @@ -480,105 +484,6 @@ } -/** homePageBackdropCard */ -.homePageBackdropCard .cardPadder { - padding-bottom: 56.25%; -} - - -.homePageBackdropCard { - width: 50%; -} - -@media all and (min-width: 640px) { - - .homePageBackdropCard { - width: 33.3%; - } -} - -@media all and (min-width: 1600px) { - - .homePageBackdropCard { - width: 25%; - } -} - -@media all and (min-width: 1920px) { - - .homePageBackdropCard { - width: 16.666666666666666666666666666667%; - } -} - -@media all and (min-width: 2200px) { - - .homePageBackdropCard { - width: 16.666666666666666666666666666667%; - } -} - - -/** homePagePortraitCard */ -.homePagePortraitCard .cardPadder { - padding-bottom: 150%; -} - - -.homePagePortraitCard { - width: 33.3%; -} - -@media all and (min-width: 540px) { - - .homePagePortraitCard { - width: 25%; - } -} - -@media all and (min-width: 800px) { - - .homePagePortraitCard { - width: 20%; - } -} - -@media all and (min-width: 1000px) { - - .homePagePortraitCard { - width: 16.666666666666666666666666666667%; - } -} - -@media all and (min-width: 1200px) { - - .homePagePortraitCard { - width: 14.285714285714285714285714285714%; - } -} - -@media all and (min-width: 1600px) { - - .homePagePortraitCard { - width: 12.5%; - } -} - -@media all and (min-width: 1920px) { - - .homePagePortraitCard { - width: 10%; - } -} - -@media all and (min-width: 2200px) { - - .homePagePortraitCard { - width: 9.09090909091%; - } -} - - /** homePageSmallBackdropCard */ .homePageSmallBackdropCard .cardPadder { padding-bottom: 56.25%; diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 6d3a96047a..054d4b7f58 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -113,23 +113,15 @@ @media all and (min-width: 600px) { - .itemsContainer:not(.fullWidthItemsContainer):not(.smallItemsContainer) { + .paddedItemsContainer { padding: 0 .8em; - margin-right: 10px; } } @media all and (min-width: 1200px) { .ehsContent { - width: 90%; - } -} - -@media all and (min-width: 1600px) { - - .ehsContent { - width: 92%; + width: 94%; } } @@ -923,14 +915,9 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .itemsContainer { - text-align: center; margin: 0 auto; } -.timelineItemsContainer { - text-align: left; -} - .alphabetPicker { position: fixed; right: 2px; @@ -999,7 +986,14 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .itemsContainerWithAlphaPicker { - margin-right: 20px; + margin-right: 25px; + } +} + +@media all and (min-width: 600px) { + + .itemsContainerWithAlphaPicker { + margin-right: 10px; } } diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css index 877b3d0b89..31d20450fc 100644 --- a/dashboard-ui/css/notifications.css +++ b/dashboard-ui/css/notifications.css @@ -135,4 +135,47 @@ .imgNotificationWarning .imgNotificationInner { background-image: url(images/notifications/error.png); - } \ No newline at end of file + } + + +.waves-effect { + position: relative; + cursor: pointer; + display: inline-block; + overflow: hidden; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-tap-highlight-color: transparent; + z-index: 1; + will-change: opacity, transform; + -webkit-transition: all 0.3s ease-out; + -moz-transition: all 0.3s ease-out; + -o-transition: all 0.3s ease-out; + -ms-transition: all 0.3s ease-out; + transition: all 0.3s ease-out; +} + +.btn-flat { + box-shadow: none; + background-color: transparent; + color: #343434; + cursor: pointer; +} + +.btn, .btn-large, .btn-flat { + display: inline-block; + height: 36px; + margin-bottom: 15px; + padding: 0 2rem; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + background-clip: padding-box; + line-height: 36px; + text-transform: uppercase; + border: none; + outline: 0; + -webkit-tap-highlight-color: transparent; +} diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html index 66cfcfb309..f65d2ca2e5 100644 --- a/dashboard-ui/dashboardhosting.html +++ b/dashboard-ui/dashboardhosting.html @@ -53,6 +53,14 @@
${LabelPublicHttpsPortHelp}
+
  • + +
    + +
    + +
    ${LabelCustomCertificatePathHelp}
    +