From 813b1c09fceacfa55a250cb35f1133cef7dc121f Mon Sep 17 00:00:00 2001 From: Artem Anufrij Date: Sat, 18 Feb 2023 00:16:08 +0100 Subject: [PATCH 01/33] share: added background image --- public/config.json | 4 +-- public/static/app.css | 8 ++++- public/static/style.css | 12 +++++++ src/components/AlbumContent.vue | 43 ++++++++++++++++++-------- src/components/BoxContent.vue | 42 ++++++++++++++++++------- src/components/dialogs/SharedItems.vue | 4 +-- src/components/dialogs/Users.vue | 8 +---- 7 files changed, 84 insertions(+), 37 deletions(-) diff --git a/public/config.json b/public/config.json index f966bb7..a3b7d4a 100644 --- a/public/config.json +++ b/public/config.json @@ -1,5 +1,5 @@ { - "backend_dev": "http://localhost:31204", - "backend_de": "https://webplay.rocks", + "backend_de": "http://localhost:31204", + "backend_dev": "https://webplay.rocks", "backend": "https://webplay.rocks" } \ No newline at end of file diff --git a/public/static/app.css b/public/static/app.css index 13dee39..ce97dad 100644 --- a/public/static/app.css +++ b/public/static/app.css @@ -89,7 +89,9 @@ td.fillCell>* { #artistViewer #background, #albumViewer #background, -#boxViewer #background { +#boxViewer #background, +#albumContent #background, +#boxContent #background { background-size: cover; background-position: center; top: -16px; @@ -591,6 +593,10 @@ td.fillCell>* { animation: glow 1s infinite alternate; } +.z-1 { + z-index: -1; +} + .z1 { z-index: 1; } diff --git a/public/static/style.css b/public/static/style.css index f7e29d8..a78298f 100644 --- a/public/static/style.css +++ b/public/static/style.css @@ -136,6 +136,10 @@ h6.slim { font-weight: normal; } +.relative { + position: relative; +} + input { border-width: 1px; border-style: solid; @@ -511,6 +515,14 @@ label.yellow50 { border-color: var(--yellow); } +button.faded { + opacity: 0.25; +} + +button.faded:hover { + opacity: 1; +} + button.medium { padding: 8px; } diff --git a/src/components/AlbumContent.vue b/src/components/AlbumContent.vue index 73d359a..fee4736 100644 --- a/src/components/AlbumContent.vue +++ b/src/components/AlbumContent.vue @@ -1,21 +1,24 @@ @@ -43,6 +46,9 @@ export default { } return this.album.covers.cover256; }, + coverBackground() { + return "background-image: url('" + this.cover + "'); z-index: -1"; + }, }, components: { TrackItem, @@ -56,16 +62,27 @@ export default { width: 256px; } -#content, -#tracks { +#albumContent { + overflow: hidden; +} +#album { overflow: auto; } +#header { + overflow: hidden; +} + +#tracks { + background-color: var(--white); + overflow-y: auto; +} @media (max-width: 480px) { - #tracks { + #album { flex-direction: column; + max-height: 100%; } - #trackList { + #tracks { border-top: 1px solid var(--light-border); } } diff --git a/src/components/BoxContent.vue b/src/components/BoxContent.vue index d14a46b..5368867 100644 --- a/src/components/BoxContent.vue +++ b/src/components/BoxContent.vue @@ -1,20 +1,23 @@ @@ -42,6 +45,9 @@ export default { } return this.box.covers.cover256; }, + coverBackground() { + return "background-image: url('" + this.cover + "'); z-index: -1"; + }, }, components: { VideoItem, @@ -55,20 +61,32 @@ export default { width: 256px; } -#content, -#videos { +#boxContent { + overflow: hidden; +} +#box { overflow: auto; } +#header { + overflow: hidden; +} + +#videos { + background-color: var(--white); + overflow-y: auto; +} + .video { max-width: 256px; } @media (max-width: 480px) { - #videos { + #box { flex-direction: column; + max-height: 100%; } - #videoList { + #videos { border-top: 1px solid var(--light-border); } .video { diff --git a/src/components/dialogs/SharedItems.vue b/src/components/dialogs/SharedItems.vue index 61d0f81..aff095a 100644 --- a/src/components/dialogs/SharedItems.vue +++ b/src/components/dialogs/SharedItems.vue @@ -21,8 +21,8 @@

{{ share.title }}

- diff --git a/src/components/dialogs/Users.vue b/src/components/dialogs/Users.vue index 1021b99..dee4b63 100644 --- a/src/components/dialogs/Users.vue +++ b/src/components/dialogs/Users.vue @@ -87,7 +87,7 @@