diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 76b78fd733..755b417f5b 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -32,6 +32,8 @@ button { .itemsContainer { display: flex; + margin-left: -0.6em; + margin-right: -0.6em; } .vertical-list { @@ -77,7 +79,7 @@ button { .cardBox { padding: 0 !important; - margin: .42em; + margin: 0.6em; transition: none; border: 0 solid transparent; /* These both are needed in case cardBox is a button */ @@ -86,25 +88,10 @@ button { contain: layout style; } -/*.cardBox-withfocuscontent { - margin: .68em; -}*/ - -@media (min-width: 50em) { - - .cardBox { - margin: .9em; - } -} - .cardBox-withfocuscontent-large { margin: .4em; } -/*.card-focuscontent { - border: .12em solid transparent; -}*/ - .card-focuscontent-large { border: .5em solid transparent; } @@ -123,7 +110,6 @@ button { } @media (max-width: 50em) { - .cardBox-bottompadded { margin-bottom: 1.2em !important; } @@ -213,9 +199,9 @@ button { font-size: inherit; } - .cardContent-button:not(.defaultCardBackground) { - background-color: transparent; - } +.cardContent-button:not(.defaultCardBackground) { + background-color: transparent; +} .visualCardBox .cardContent { border-bottom-left-radius: 0; @@ -371,9 +357,9 @@ button { justify-content: center;*/ } - .textActionButton:hover { - text-decoration: underline; - } +.textActionButton:hover { + text-decoration: underline; +} .cardImageIcon { font-size: 5em; @@ -797,4 +783,4 @@ button { .cardOverlayFab-primary:hover { transform: scale(1.4, 1.4); transition: 0.2s; -} +} \ No newline at end of file diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 867fa117a0..fca8abcdd0 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -414,12 +414,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la var scrollX = !layoutManager.desktop; if (userViews.length) { - html += '
'; - - html += '
'; html += '

' + globalize.translate('HeaderMyMedia') + '

'; - html += '
'; if (scrollX) { html += '
'; diff --git a/src/css/librarybrowser.css b/src/css/librarybrowser.css index 2e4be894ec..ef8e11f5b9 100644 --- a/src/css/librarybrowser.css +++ b/src/css/librarybrowser.css @@ -887,10 +887,6 @@ margin-bottom: 2.7em } -.sectionTitleContainer { - margin: 1.25em 0 -} - .sectionTitleButton, .sectionTitleIconButton { margin-right: 0 !important; @@ -898,30 +894,22 @@ vertical-align: middle } -.sectionTitleContainer-cards { - margin-bottom: .1em +.sectionTitleContainer { + margin: 1.25em 0; } -.sectionTitle { - margin-bottom: 1em +.sectionTitleContainer > .sectionTitle { + margin: 0; + display: inline-block; + vertical-align: middle; +} + +.sectionTitleContainer-cards { + margin-bottom: 0; } .sectionTitle-cards { - margin-left: .28em; - margin-bottom: 0 -} - -@media all and (min-width:50em) { - .sectionTitle-cards { - margin-left: .55em - } -} - -.sectionTitleContainer>.sectionTitle { - margin-top: 0; margin-bottom: 0; - display: inline-block; - vertical-align: middle } .sectionTitleButton { @@ -930,7 +918,7 @@ flex-shrink: 0 } -.sectionTitleButton+.sectionTitleButton { +.sectionTitleButton + .sectionTitleButton { margin-left: .5em !important } diff --git a/src/css/videoosd.css b/src/css/videoosd.css index 61ad459256..b1566c2207 100644 --- a/src/css/videoosd.css +++ b/src/css/videoosd.css @@ -14,7 +14,6 @@ } .osdHeader { - padding-bottom: 3vh; -webkit-transition: opacity .3s ease-out; -o-transition: opacity .3s ease-out; transition: opacity .3s ease-out; diff --git a/src/dashboard.html b/src/dashboard.html index c8fcb93ebf..67d269db3d 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -32,8 +32,8 @@
- -

${HeaderActiveDevices}

+
+

${HeaderActiveDevices}

diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index cc9ef030f1..f9c759dceb 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -281,7 +281,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " pageIds: ["userProfilesPage", "newUserPage", "editUserPage", "userLibraryAccessPage", "userParentalControlPage", "userPasswordPage"], icon: "people" }, { - name: globalize.translate("TabLibrary"), + name: globalize.translate("HeaderLibraries"), href: "library.html", pageIds: ["mediaLibraryPage", "librarySettingsPage", "libraryDisplayPage", "metadataImagesConfigurationPage", "metadataNfoPage"], icon: "folder", diff --git a/src/selectserver.html b/src/selectserver.html index 1ddab3e6d8..dd52467bfe 100644 --- a/src/selectserver.html +++ b/src/selectserver.html @@ -1,7 +1,7 @@
-

${HeaderSelectServer}

+

${HeaderSelectServer}

@@ -12,4 +12,4 @@ ${ButtonAddServer}
-
\ No newline at end of file +
diff --git a/src/userprofiles.html b/src/userprofiles.html index 669afb0475..f5858fc6d6 100644 --- a/src/userprofiles.html +++ b/src/userprofiles.html @@ -4,22 +4,17 @@
-

- ${HeaderUsers} -

+

${HeaderUsers}

${Help}
-
+
-
-

- ${HeaderPendingInvitations} -

+

${HeaderPendingInvitations}