diff --git a/approot/artist.xml b/approot/artist.xml index 766fb397..e8e868dc 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -26,7 +26,9 @@
- ${cover class="media-object Lms-cover"} +
+ ${cover} +

diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 4e89013f..ee9a9a10 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -33,7 +33,9 @@

${name}

diff --git a/approot/releases.xml b/approot/releases.xml index d3fce2d0..2be216d9 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -21,7 +21,9 @@
- ${cover class="media-object Lms-cover Lms-cover-container-medium"} +
+ ${cover} +

@@ -40,7 +42,9 @@
- ${cover class="media-object Lms-cover Lms-cover-container-smaller"} +
+ ${cover} +
diff --git a/approot/search.xml b/approot/search.xml index 0697b472..8c3fff06 100644 --- a/approot/search.xml +++ b/approot/search.xml @@ -25,7 +25,9 @@

${name}

diff --git a/approot/tracks.xml b/approot/tracks.xml index eaf00d79..fb0c26ac 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -26,7 +26,9 @@

${name}

diff --git a/approot/tracksinfo.xml b/approot/tracksinfo.xml deleted file mode 100644 index f1d8bc91..00000000 --- a/approot/tracksinfo.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - -

${tr:Lms.Explore.TracksInfo.most-played}

- ${most-played} -

${tr:Lms.Explore.TracksInfo.recently-added}

- ${recently-added} - - - -
-
- ${name} -
-
- - - diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 9f9746d5..76fe2ad9 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -62,40 +62,41 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { cursor: pointer; } +.Lms-cover { + max-height: 100%; + max-width: 100%; + width: auto; + height: auto; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; + border-radius: 3px; + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); +} + .Lms-cover:hover { filter: brightness(130%); } .Lms-cover-container-smaller { -} - -.Lms-cover-smaller { width: 64px; - border-radius: 3px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); + height: 64px; + position: relative; } .Lms-cover-container-small { -} - -.Lms-cover-small { width: 96px; - border-radius: 3px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); + height: 96px; + position: relative; } .Lms-cover-container-medium { -} - -.Lms-cover-medium { width: 128px; - border-radius: 3px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); -} - -.Lms-cover-large { - border-radius: 3px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); + height: 128px; + position: relative; } .Lms-entry-playing { @@ -119,8 +120,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { } .Lms-explore-releases-entry { - padding-top: 8px; - padding-bottom: 8px; + padding-top: 4px; + padding-bottom: 4px; } .Lms-explore-release-cover { @@ -181,8 +182,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { } .Lms-explore-artist-entry { - padding-top: 8px; - padding-bottom: 8px; + padding-top: 4px; + padding-bottom: 4px; } .Lms-explore-artist-entries-container { @@ -193,10 +194,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { margin-bottom: 8px; } -.Lms-explore-tracks-entry { - min-height: 32px; -} - .Lms-explore-tracks-entry:hover .Lms-explore-tracks-entry-controls { display: block; } @@ -221,11 +218,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { display: block; } -.Lms-explore-tracksinfo-entry { - min-height: 28px; - margin: 0; -} - .Lms-header { padding-bottom: 9px; margin-top: 20px; @@ -248,10 +240,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { text-align: left; } -.Lms-playqueue-entry { - min-height: 32px; -} - .Lms-playqueue-entry:hover .Lms-playqueue-entry-controls { display: block; } diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index 56261ddc..8323ace1 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -144,7 +144,7 @@ Artist::createRelease(const Database::Artist::pointer& artist, const Release::po auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); - cover->setStyleClass("Lms-cover-medium"); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp index a1948d31..bf62d015 100644 --- a/src/lms/ui/explore/ReleaseListHelpers.cpp +++ b/src/lms/ui/explore/ReleaseListHelpers.cpp @@ -43,7 +43,7 @@ namespace UserInterface::ReleaseListHelpers Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 64)); - cover->setStyleClass("Lms-cover-smaller"); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); auto artists = release->getReleaseArtists(); diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp index ddc5977c..80cb9625 100644 --- a/src/lms/ui/explore/ReleasesView.cpp +++ b/src/lms/ui/explore/ReleasesView.cpp @@ -117,7 +117,7 @@ Releases::createEntry(const Release::pointer& release) Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); - cover->setStyleClass("Lms-cover-medium"); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp index afda3440..371df9b6 100644 --- a/src/lms/ui/explore/SearchView.cpp +++ b/src/lms/ui/explore/SearchView.cpp @@ -72,7 +72,7 @@ namespace UserInterface Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } } @@ -80,7 +80,7 @@ namespace UserInterface { auto cover = entry->bindNew("cover"); cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setStyleClass("Lms-cover"); } return entry; diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index 581769e2..3aca498e 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -229,7 +229,7 @@ Tracks::createEntry(const Track::pointer& track) Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setStyleClass("Lms-cover"); anchor->setImage(std::move(cover)); } } @@ -237,7 +237,7 @@ Tracks::createEntry(const Track::pointer& track) { auto cover = entry->bindNew("cover"); cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); - cover->setStyleClass("Lms-cover-small"); + cover->setStyleClass("Lms-cover"); } entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain);