owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some more btn polish

Browse Source
This commit is contained in:
emeric
2020-04-14 09:43:59 +02:00
parent 6e237caaef
commit 2e660314a2
6 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/explore.xml
+3 -10
View File
@@ -13,22 +13,15 @@
</div> </div>
</message> </message>
<message id="Lms.Explore.template.add-btn"> <message id="Lms.Explore.template.add-btn"><i class="fa fa-plus-circle Lms-explore-btn Lms-control-btn"></i></message>
<i class="fa fa-plus-circle Lms-explore-btn Lms-control-btn"></i> <message id="Lms.Explore.template.play-btn"><i class="fa fa-play-circle Lms-explore-btn Lms-control-btn"></i></message>
</message>
<message id="Lms.Explore.template.play-btn">
<i class="fa fa-play-circle Lms-explore-btn Lms-control-btn"></i>
</message>
<message id="Lms.Explore.template.filters"> <message id="Lms.Explore.template.filters">
<h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3> <h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3>
${clusters} ${clusters}
</message> </message>
<message id="Lms.Explore.template.cluster-entry"> <message id="Lms.Explore.template.cluster-entry"><span class="badge {1}">${<if-can-delete>}<i class="fa fa-times-circle"></i> ${</if-can-delete>}${name}</span></message>
<span class="badge {1}">${<if-can-delete>}<i class="fa fa-times-circle"></i> ${</if-can-delete>}${name}</span>
</message>
<message id="Lms.Explore.template.add-filter"> <message id="Lms.Explore.template.add-filter">
<div class="form-horizontal"> <div class="form-horizontal">
approot/playqueue.xml
+7 -23
View File
@@ -2,21 +2,10 @@
<messages xmlns:if="Wt.WTemplate.conditions"> <messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks--> <!--FORMS message blocks-->
<message id="Lms.PlayQueue.template.clear-btn"> <message id="Lms.PlayQueue.template.clear-btn"><i class="fa fa-fw fa-times-circle Lms-playqueue-btn Lms-control-btn"></i></message>
<i class="fa fa-times-circle Lms-playqueue-btn Lms-control-btn"></i> <message id="Lms.PlayQueue.template.shuffle-btn"><i class="fa fa-fw fa-random Lms-playqueue-btn Lms-control-btn"></i></message>
</message> <message id="Lms.PlayQueue.template.repeat-btn"><i class="fa fa-fw fa-repeat Lms-playqueue-btn Lms-control-btn"></i></message>
<message id="Lms.PlayQueue.template.radio-btn"><i class="fa fa-fw fa-rss Lms-playqueue-btn Lms-control-btn"></i></message>
<message id="Lms.PlayQueue.template.shuffle-btn">
<i class="fa fa-random Lms-playqueue-btn Lms-control-btn"></i>
</message>
<message id="Lms.PlayQueue.template.repeat-btn">
<i class="fa fa-repeat Lms-playqueue-btn Lms-control-btn"></i>
</message>
<message id="Lms.PlayQueue.template.radio-btn">
<i class="fa fa-rss Lms-playqueue-btn Lms-control-btn"></i>
</message>
<message id="Lms.PlayQueue.template"> <message id="Lms.PlayQueue.template">
<div class="row"> <div class="row">
@@ -36,13 +25,8 @@
</div> </div>
</message> </message>
<message id="Lms.PlayQueue.template.play-btn"> <message id="Lms.PlayQueue.template.play-btn"><i class="fa fa-fw fa-play-circle Lms-playqueue-btn Lms-control-btn"></i></message>
<i class="fa fa-play-circle Lms-playqueue-btn Lms-control-btn"></i> <message id="Lms.PlayQueue.template.delete-btn"><i class="fa fa-fw fa-times-circle Lms-playqueue-btn Lms-control-btn"></i></message>
</message>
<message id="Lms.PlayQueue.template.delete-btn">
<i class="fa fa-times-circle Lms-playqueue-btn Lms-control-btn"></i>
</message>
<message id="Lms.PlayQueue.template.entry"> <message id="Lms.PlayQueue.template.entry">
<div class="row Lms-playqueue-entry Lms-entry-hoverable Lms-vertical-align"> <div class="row Lms-playqueue-entry Lms-entry-hoverable Lms-vertical-align">
@@ -54,7 +38,7 @@
${</if-has-artists-or-release>} ${</if-has-artists-or-release>}
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<div class="Lms-playqueue-entry-controls"> <div class="Lms-playqueue-entry-controls Lms-vertical-align">
${play-btn}${del-btn} ${play-btn}${del-btn}
</div> </div>
<div class="Lms-playqueue-entry-duration text-muted"> <div class="Lms-playqueue-entry-duration text-muted">
docroot/css/lms-darkly.css
+8
View File
@@ -9,6 +9,14 @@
color: #7e7e7e; color: #7e7e7e;
} }
.Lms-artistname.text-primary, .Lms-artistname.text-primary:hover {
color: var(--body-color)
}
a.Lms-artistname.text-primary:hover {
color: var(--hover-color)
}
.Lms-player-btn { .Lms-player-btn {
color: var(--body-color) color: var(--body-color)
} }
docroot/css/lms.css
+10 -2
View File
@@ -53,6 +53,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
.Lms-cluster { .Lms-cluster {
display: inline; display: inline;
cursor: pointer; cursor: pointer;
line-height: 32px;
margin: 4px;
} }
.Lms-cluster:hover { .Lms-cluster:hover {
@@ -247,7 +249,9 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
} }
.Lms-explore-btn { .Lms-explore-btn {
font-size: 22px !important; font-size: 24px !important;
text-align: center;
width: 28px;
cursor: pointer; cursor: pointer;
} }
@@ -270,7 +274,11 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
.Lms-playqueue-btn { .Lms-playqueue-btn {
font-size: 22px !important; font-size: 22px !important;
cursor: pointer; cursor: pointer;
margin: 2px; }
.text-success .Lms-playqueue-btn {
filter: brightness(130%);
filter: drop-shadow(0 0 0.65rem var(--hover-color));
} }
.Lms-playqueue-entry-controls { .Lms-playqueue-entry-controls {
src/lms/ui/LmsApplication.cpp
-1
View File
@@ -128,7 +128,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env,
Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-flatly.css"}}, Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-flatly.css"}},
// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-darkly.min.css"}}, // Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-darkly.min.css"}},
// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-darkly.css"}}, // Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-darkly.css"}},
// Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-slate.css"}},
Wt::WLinkedCssStyleSheet { Wt::WLink {"resources/themes/bootstrap/3/wt.css"}}, Wt::WLinkedCssStyleSheet { Wt::WLink {"resources/themes/bootstrap/3/wt.css"}},
}; };
} }
src/lms/ui/PlayQueueView.cpp
+4 -2
View File
@@ -163,13 +163,15 @@ PlayQueue::PlayQueue()
void void
PlayQueue::updateRepeatBtn() PlayQueue::updateRepeatBtn()
{ {
_repeatBtn->toggleStyleClass("Lms-playqueue-btn-selected", _repeatAll); _repeatBtn->toggleStyleClass("text-success", _repeatAll);
_repeatBtn->toggleStyleClass("text-muted", !_repeatAll);
} }
void void
PlayQueue::updateRadioBtn() PlayQueue::updateRadioBtn()
{ {
_radioBtn->toggleStyleClass("Lms-playqueue-btn-selected",_radioMode); _radioBtn->toggleStyleClass("text-success",_radioMode);
_radioBtn->toggleStyleClass("text-muted", !_radioMode);
} }
Database::TrackList::pointer Database::TrackList::pointer