diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index aa6558812a..9e21f31b6a 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -35,29 +35,6 @@

${MessageNoCollectionsAvailable}

-
-
- -

${HeaderNewCollection}

- -
-
- - -
${NewCollectionNameExample}
-
- -
-
- - -
-
-

- -

-
-
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 23665a481a..10c8da2c55 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -160,12 +160,6 @@ vertical-align: middle; } -.viewMenuTextLink:hover { - background-color: #38c; - color: #fff !important; - opacity: 1; -} - .headerButtonRight:hover { opacity: .5; } @@ -183,36 +177,27 @@ vertical-align: top; } -.viewMenuTextLink { - display: block; - padding: .7em .5em .6em 38px !important; - font-size: 14px; +.librarySidebarLinks a { font-weight: 300 !important; - font-family: Roboto; - background-repeat: no-repeat; - background-size: 13px 13px; - background-position: 12px center; } + .librarySidebarLinks a:hover { + background-color: #38c !important; + color: #fff !important; + } + .musicViewMenu { background-image: url(images/items/folders/music.png); } .homeViewMenu { - background-image: url(images/mblogoicon.png); - background-size: 39px 26px; - background-position: 10px center; - padding-left: 60px !important; + background-image: url(images/mblogoicon.png) !important; + background-size: 39px 26px !important; + background-position: 13px center !important; + padding-left: 66px !important; + background-repeat: no-repeat !important; } -.iconViewMenu { - padding-left: 13px !important; -} - - .iconViewMenu span { - margin-right: 11px !important; - } - .viewMenuSecondary { position: absolute; top: 0; diff --git a/dashboard-ui/css/materialize.css b/dashboard-ui/css/materialize.css new file mode 100644 index 0000000000..0ad8599f24 --- /dev/null +++ b/dashboard-ui/css/materialize.css @@ -0,0 +1,183 @@ +.z-depth-1, nav, .card-panel, .toast, .btn, .btn-large, .btn-floating, .dropdown-content, .collapsible, ul.side-nav.full, ul.side-nav.fixed { + -webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + -moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + + .z-depth-1-half, .btn:hover, .btn-large:hover, .btn-floating:hover, .modal { + -webkit-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15); + box-shadow: 0 5px 11px 0 rgba(0, 0, 0, 0.18), 0 4px 15px 0 rgba(0, 0, 0, 0.15); + } + + .toast .btn, .toast .btn-large, .toast .btn-flat { + margin: 0; + margin-left: 3rem; + } + +.btn, .btn-large, .btn-flat { + display: block; + padding: 0 2rem; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + background-clip: padding-box; + text-transform: uppercase; + border: none; + outline: 0; + -webkit-tap-highlight-color: transparent; + margin-bottom: 15px; +} + + .btn.disabled, .disabled.btn-large, .btn-floating.disabled, .btn-large.disabled, .btn:disabled, .btn-large:disabled, .btn-large:disabled, .btn-floating:disabled { + background-color: #DFDFDF; + box-shadow: none; + color: #9F9F9F; + } + + .btn.disabled:hover, .disabled.btn-large:hover, .btn-floating.disabled:hover, .btn-large.disabled:hover, .btn:disabled:hover, .btn-large:disabled:hover, .btn-large:disabled:hover, .btn-floating:disabled:hover { + background-color: #DFDFDF; + color: #9F9F9F; + } + + .btn i, .btn-large i, .btn-floating i, .btn-large i, .btn-flat i { + font-size: 1.3rem; + } + +.btn, .btn-large { + text-decoration: none; + color: #FFF; + background-color: #2196F3; + text-align: center; + letter-spacing: 0.5px; + -webkit-transition: 0.2s ease-out; + -moz-transition: 0.2s ease-out; + -o-transition: 0.2s ease-out; + -ms-transition: 0.2s ease-out; + transition: 0.2s ease-out; + cursor: pointer; +} + +.btn-floating { + display: inline-block; + position: relative; + z-index: 1; + width: 37px; + height: 37px; + line-height: 37px; + padding: 0; + background-color: #2196F3; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + border-radius: 50%; + background-clip: padding-box; + -webkit-transition: 0.3s; + -moz-transition: 0.3s; + -o-transition: 0.3s; + -ms-transition: 0.3s; + transition: 0.3s; + cursor: pointer; +} + + .btn-floating i { + width: inherit; + display: inline-block; + text-align: center; + color: #FFF; + font-size: 1.6rem; + line-height: 37px; + } + + .btn-floating.btn-large { + width: 55.5px; + height: 55.5px; + } + + .btn-floating.btn-large i { + line-height: 55.5px; + } + +.btn-flat { + box-shadow: none; + background-color: transparent; + color: #343434; + cursor: pointer; +} + + .btn-flat.disabled { + color: #b3b3b3; + } + +.btn { + padding: .6em 2em; +} + +.btn-large { + padding: 1em 2em; +} + + .btn-large i { + font-size: 1.6rem; + } + + +.btn, .btn-large { + background-color: #38c; +} + +.btnAction { + background-color: #ee6e73; +} + +.btnAltAction { + background-color: #ff8f00; +} + +.btnActionAccent { + background-color: #52B54B; +} + +.btn, .btn-large { + color: #fff !important; + font-weight: 500 !important; + font-size: 15px; + font-family: Roboto !important; +} + +.btnCancel { + background-color: #444; +} + +.ui-page-theme-a .btnCancel { + background-color: #e8e8e8; + color: #333!important; +} + +.ui-page-theme-a .btnCancel i { + color: #666!important; +} + +.btn-inline { + display: inline-block; + width: auto; + margin-bottom: 0; +} + +button.btn:not(.btn-inline),button.btn-large:not(.btn-inline) { + width: 100%; +} + +.btn i, .btn-large i, .btn span, .btn-large span { + vertical-align: middle; +} + +.btn i { + position: absolute; + left: 24px; +} + +.btn-large i { + position: absolute; + left: 24px; + top: 22px; +} diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css index 31d20450fc..877b3d0b89 100644 --- a/dashboard-ui/css/notifications.css +++ b/dashboard-ui/css/notifications.css @@ -135,47 +135,4 @@ .imgNotificationWarning .imgNotificationInner { background-image: url(images/notifications/error.png); - } - - -.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; -} + } \ No newline at end of file diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index 1fae944283..b24659c4e7 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -140,39 +140,37 @@ } .headerSearchInput { - width: 100%; - margin-top: 12px; + margin: 0; background: #222; border: 0; color: #ddd; border-radius: 3px; - padding: 5px 7px 4px 50px; + padding: 4px 7px 3px 50px; font-size: 14px; font-family: Roboto; outline: none; + vertical-align: middle; + width: 200px; } .searchInputIcon { position: absolute; left: 20px; - top: 19px; + top: 6px; font-size: 14px !important; color: #ddd !important; } .viewMenuSearch { - position: absolute; - top: 0; - left: 40%; - right: 40%; + position: relative; display: none; - padding-right: 55px; + margin-left: 2em; } -@media all and (min-width: 800px) { +@media all and (min-width: 900px) { .viewMenuSearch { - display: block; + display: inline-block; } .headerSearchButton { @@ -180,17 +178,9 @@ } } -@media all and (min-width: 1200px) { - - .viewMenuSearch { - left: 42%; - right: 42%; - } -} - .searchResultsOverlay { position: fixed; - background: #222 !important; + background: rgba(34, 34, 34, 1); top: 50px; left: 0; right: 0; @@ -202,3 +192,8 @@ .searchResultsContainer { padding: 2em; } + +.btnCloseSearch { + margin-left: 5px; + outline: 0; +} diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index dcc6b9c615..8534a8bf61 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -1042,3 +1042,17 @@ h1 + .accentButton { .dashboardFooter .appLinks img { height: 16px; } + +.supporterPromotion { + margin: 1em 0; +} + +@media all and (min-width: 1200px) { + + .supporterPromotion { + position: absolute; + top: 70px; + right: 20px; + margin: 0; + } +} diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index ce99f91912..82134b73d7 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -14,6 +14,16 @@ ${TabSettings}
+ diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index eb18b79b41..9da0fc98ec 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -46,7 +46,7 @@
  • - +
    diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 5683e4e1fa..ea9d8558d0 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -227,42 +227,6 @@
    • - -
    -
    - -

    ${HeaderAddToCollection}

    - -
    -
    - - -
    -
    -
    -
    - - -
    ${NewCollectionNameExample}
    -
    - -
    -
    - - -
    -
    -
    -

    - - -

    -
    -
    - - diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html index e9b8282c42..af5571b2c2 100644 --- a/dashboard-ui/mypreferencesdisplay.html +++ b/dashboard-ui/mypreferencesdisplay.html @@ -27,10 +27,17 @@
    ${LabelSelectFolderGroupsHelp}

    - + +
    +
    + + +
    +
    ${LabelDisplayCollectionsViewHelp}
    +
    + +
    - -
    diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 16da8e2dfa..709b3c49b9 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -24,6 +24,12 @@ Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) { + if (pluginSecurityInfo.IsMBSupporter) { + $('.supporterPromotion', page).hide(); + } else { + $('.supporterPromotion', page).show(); + } + DashboardPage.renderSupporterIcon(page, pluginSecurityInfo); }); diff --git a/dashboard-ui/scripts/directorybrowser.js b/dashboard-ui/scripts/directorybrowser.js index 4c6334857a..9e81aeae8b 100644 --- a/dashboard-ui/scripts/directorybrowser.js +++ b/dashboard-ui/scripts/directorybrowser.js @@ -90,7 +90,7 @@ fileOptions.includeFiles = options.includeFiles; } - options.header = options.header || Globalize.translate('HeaderSelectMediaPath'); + options.header = options.header || Globalize.translate('HeaderSelectPath'); options.instruction = options.instruction || ""; var html = '