diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css index 5b2df66dca..72cae68937 100644 --- a/dashboard-ui/css/dashboard.css +++ b/dashboard-ui/css/dashboard.css @@ -549,7 +549,7 @@ a[data-role='button'], .type-interior button:not([data-role='none']):not(.clearB } .activeDevicesCollapsible .ui-collapsible-content { - padding: .25em !important; + padding: .5em .5em !important; } .activeSession:not(.playingSession) .sessionNowPlayingContent { @@ -648,3 +648,52 @@ a[data-role='button'], .type-interior button:not([data-role='none']):not(.clearB .disabledUserBanner { margin: 0 0 2em; } + +.appLinks a { + text-decoration: none !important; +} + + .appLinks a + a { + margin-left: 5px; + } + +.appLinks img { + height: 36px; +} + +/* + Media Library Page + */ +.mediaFolderButtons { + margin-top: 10px; +} + +.mediaFolderLocations { + margin: 1em .25em !important; +} + +.mediaLocationsHeader { + padding-top: .75em !important; + padding-bottom: .75em !important; +} + + .mediaLocationsHeader .ui-btn { + position: absolute; + right: -3px; + margin-top: 0 !important; + margin-bottom: 0 !important; + top: 4px; + } + +.btnShowStatusMessage { + font-weight: normal !important; + text-decoration: none; +} + + .btnShowStatusMessage:hover { + text-decoration: underline; + } + +.supporterMembershipDisabled .tabSupporterMembership { + display: none; +} \ No newline at end of file diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index d2006217c9..1dc73f59e4 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -2,15 +2,6 @@ visibility: hidden; } -/* Fixes the issue of jqm panels altering the page background. */ -.ui-panel-content-wrap { - background: none !important; -} - -.ui-panel fieldset + fieldset { - margin-top: 2em; -} - .headerArrowImage { height: 20px; margin-left: .5em; @@ -167,7 +158,7 @@ } } -.detailPageContent, .detailPageContent > table { +.detailPageContent { margin: 0 auto; padding: 0; border-spacing: 0; @@ -184,31 +175,10 @@ margin: .5em 0 .5em; } - .listPaging paper-fab { - width: 40px; - height: 40px; - vertical-align: middle; - } - .viewControls + .listTopPaging { margin-left: .5em !important; } -.labelPageSize { - margin-left: 1em !important; - display: inline !important; -} - -.pageSizeContainer { - display: inline-block; -} - -@media all and (max-width: 650px) { - .pageSizeContainer { - display: none !important; - } -} - .criticReview { margin: 1.5em 0; background: #222; @@ -618,27 +588,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { max-width: 100%; } -.libraryPanelHeader { - margin: 5px 0 15px 0; - font-size: 15px; -} - - .libraryPanelHeader a { - text-decoration: none; - } - - .libraryPanelHeader img { - height: 24px; - vertical-align: middle; - margin-right: 6px; - } - - .libraryPanelHeader span { - color: #fff; - vertical-align: middle; - font-weight: 400; - } - .detailImageProgressContainer { position: absolute; bottom: 2px; @@ -662,10 +611,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { display: inline-block; margin-bottom: 2em; } - - .editMetadataForm .ui-field-contain { - margin: .25em 0; - } } @media all and (max-height: 900px), (max-width: 800px) { @@ -1223,107 +1168,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -.viewCollageImage { - display: inline-block; - margin: 0 1px 0 0; - width: 32.62%; - height: 49%; - background-repeat: no-repeat; - background-position: center 15%; - background-size: cover; -} - -@media all and (min-width: 650px) { - - .viewCollageImage { - width: 32.9%; - height: 49.1%; - } -} - -@media all and (min-width: 1440px) { - - .viewCollageImage { - width: 32.95%; - } -} - -.spotlight { - position: absolute; - left: 0; - right: 0; - background-size: cover; - background-position: center 25%; - background-repeat: no-repeat; -} - -.spotlight, .spotlightPlaceHolder { - height: 340px; -} - -.spotlightContainer { - min-height: 340px; - margin-top: 3em; -} - -.spotlightPlaceHolder { - margin-bottom: 3em; -} - -.spotlightTitle { - margin: 1em 0 .2em; -} - -.spotlightContent { - position: absolute; - top: 60px; - bottom: 55px; - left: 210px; - width: 600px; - background: rgba(0,0,0,.8); - border-radius: 5px; -} - -.rightSpotlightContent { - left: initial; - width: 400px; - right: 100px; -} - -.spotlightPoster { - height: 100%; - background-size: 150px 100%; - background-position: left center; - background-repeat: no-repeat; - overflow: hidden; -} - -.rightSpotlightContent .spotlightPoster { - background-size: 100% 180px; - background-position: center top; -} - -.spotlightContentInner { - padding: 1em 1em 1em 170px; -} - - .spotlightContentInner p { - max-height: 130px; - overflow: hidden; - text-overflow: ellipsis; - } - -.rightSpotlightContent .spotlightContentInner { - padding: 195px 1em 1em 1em; -} - -@media all and (max-height: 1079px) and (max-width: 1400px) { - - .spotlightContainer { - display: none; - } -} - .channelHeader { padding: 1em; text-align: center; @@ -1444,14 +1288,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -.studioTabDisabled .tvStudiosTab, .studioTabDisabled .movieStudiosTab { - display: none !important; -} - -.tvEpisodesTabDisabled .tvEpisodesTab { - display: none !important; -} - .homeFavoritesDisabled .homeFavoritesTab { display: none !important; } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index ed21de3020..999bb68680 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -121,7 +121,7 @@ h1 a:hover { color: #52B54B !important; } -input:not(.paper-input):not(.likePaperText):not([type='checkbox']):not([type='radio']):not([type='file']):not([type='range']):not([is='emby-input']) { +input:not(.paper-input):not([type='checkbox']):not([type='radio']):not([type='file']):not([type='range']):not([is='emby-input']) { -webkit-appearance: none; -webkit-font-smoothing: antialiased; -webkit-rtl-ordering: logical; @@ -429,10 +429,6 @@ paper-input + .fieldDescription { font-weight: 500; } -.invalidEntry { - background-color: lightpink !important; -} - /* Tabs (e.g. advanced metadata page) */ .localnav { margin-bottom: 30px !important; @@ -450,22 +446,6 @@ paper-input + .fieldDescription { padding-bottom: 160px; } -.appLinks a { - text-decoration: none !important; -} - - .appLinks a + a { - margin-left: 5px; - } - -.appLinks img { - height: 36px; -} - -.activeDevicesCollapsible .ui-collapsible-content { - padding: .5em .5em !important; -} - @media all and (min-width: 450px) { .currentUsername { @@ -501,30 +481,6 @@ paper-input + .fieldDescription { } } -/* - Media Library Page - */ -.mediaFolderButtons { - margin-top: 10px; -} - -.mediaFolderLocations { - margin: 1em .25em !important; -} - -.mediaLocationsHeader { - padding-top: .75em !important; - padding-bottom: .75em !important; -} - - .mediaLocationsHeader .ui-btn { - position: absolute; - right: -3px; - margin-top: 0 !important; - margin-bottom: 0 !important; - top: 4px; - } - #ulDirectoryPickerList a { padding-top: .4em; padding-bottom: .4em; @@ -663,19 +619,6 @@ progress { opacity: .5; } -.userProfileIcon { - width: 36px; -} - -.btnShowStatusMessage { - font-weight: normal !important; - text-decoration: none; -} - - .btnShowStatusMessage:hover { - text-decoration: underline; - } - .dashboardFooter { margin-top: 50px; text-align: center; @@ -729,10 +672,6 @@ progress { user-drag: none; } -.supporterMembershipDisabled .tabSupporterMembership { - display: none; -} - .syncActivityForTarget { margin: 0 0 3em 0; } diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 220a47bbc0..476ab08e87 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -115,10 +115,6 @@ h1, h1 a { justify-content: center; } -.libraryPanelHeader span { - font-weight: 400; -} - .noSecondaryNavPage .itemBackdrop { margin-top: 0; } diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html index f730d01ef1..824b61b649 100644 --- a/dashboard-ui/reports.html +++ b/dashboard-ui/reports.html @@ -6,6 +6,15 @@ border-color: #454545 /*{b-page-border}*/; color: #fff /*{b-page-color}*/; } + + /* Fixes the issue of jqm panels altering the page background. */ + .ui-panel-content-wrap { + background: none !important; + } + + .ui-panel fieldset + fieldset { + margin-top: 2em; + }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index ed6ec5a8e7..c344f0ee2d 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1650,14 +1650,6 @@ var AppInfo = {}; elem.classList.add('touch'); } - if (!AppInfo.enableStudioTabs) { - elem.classList.add('studioTabDisabled'); - } - - if (!AppInfo.enableTvEpisodesTab) { - elem.classList.add('tvEpisodesTabDisabled'); - } - if (!AppInfo.enableSupporterMembership) { elem.classList.add('supporterMembershipDisabled'); } @@ -2057,7 +2049,7 @@ var AppInfo = {}; Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId()); }; - embyRouter.showItem = function (item) { + function showItem(item) { if (typeof (item) === 'string') { require(['connectionManager'], function (connectionManager) { var apiClient = connectionManager.currentApiClient(); @@ -2066,7 +2058,9 @@ var AppInfo = {}; } else { Dashboard.navigate(LibraryBrowser.getHref(item)); } - }; + } + + embyRouter.showItem = showItem; return embyRouter; }); diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 34da949bd6..14ee4d8f0d 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -184,29 +184,6 @@ paper-button.notext { margin-right: 0; } -.bottomFab { - bottom: 90px; -} - -paper-dialog { - border-radius: 4px; - z-index: 999999 !important; - font-family: inherit !important; -} - - paper-dialog h2 { - font-family: inherit !important; - } - -iron-overlay-backdrop { - z-index: 999998 !important; -} - -/* These values default to 24px and create huge white padding around the dialog content. */ -.scrollable.paper-dialog-scrollable { - padding: 0 12px; -} - paper-icon-button paper-ripple { color: inherit !important; } @@ -215,14 +192,6 @@ paper-icon-button paper-ripple { color: #444 !important; } -paper-dialog + iron-overlay-backdrop { - background-color: transparent !important; -} - -paper-dialog[role="alertdialog"] + iron-overlay-backdrop { - background-color: #000 !important; -} - paper-tabs { background-color: #020202; color: #fff; @@ -493,36 +462,6 @@ paper-radio-group > * { padding: .5em; } -.likePaperText { - -webkit-appearance: none; - -webkit-font-smoothing: antialiased; - -webkit-rtl-ordering: logical; - -webkit-user-select: text; - background: none !important; - background-color: transparent !important; - border: 1px solid gray !important; - border-width: 0 0 1px 0 !important; - color: #fff !important; - box-shadow: none; - outline: none !important; - padding: 0 !important; - position: relative; - text-indent: 0px !important; - width: 100%; - -webkit-writing-mode: horizontal-tb; - margin: 0 0 1em 0 !important; -} - - .likePaperText:focus { - border-color: #52B54B !important; - } - -.likePaperLabel { - margin: 1em 0 .5em !important; - color: #858585 !important; - display: block; -} - div.dialogHeader { padding: .35em .5em; display: flex;