okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
vapormusic 2022-02-10 12:58:24 +07:00
commit 99968987c8
2 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/renderer/less/bootstrap.less vendored
View file

@ -1205,24 +1205,6 @@ fieldset:disabled .btn {
max-width: 1320px;
}
}
.row {
--bs-gutter-x: 1.5rem;
--bs-gutter-y: 0;
display: flex;
flex-wrap: wrap;
margin-top: calc(var(--bs-gutter-y) * -1);
margin-right: calc(var(--bs-gutter-x) * -.5);
margin-left: calc(var(--bs-gutter-x) * -.5);
}
.row > * {
box-sizing: border-box;
flex-shrink: 0;
width: 100%;
max-width: 100%;
padding-right: calc(var(--bs-gutter-x) * .5);
padding-left: calc(var(--bs-gutter-x) * .5);
margin-top: var(--bs-gutter-y);
}
.col {
flex: 1 0 0%;

12
src/renderer/views/pages/home.ejs
View file

@ -4,10 +4,10 @@
<div class="row">
<div class="col">
<div class="row">
<div class="col">
<div class="col nopadding">
<h3>{{app.getLz('home.recentlyPlayed')}}</h3>
</div>
<div class="col-auto flex-center">
<div class="col-auto nopadding flex-center">
<button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.seeAll')}}</button>
</div>
</div>
@ -21,10 +21,10 @@
</div>
<div class="col">
<div class="row">
<div class="col">
<div class="col nopadding">
<h3>{{app.getLz('home.artistsFeed')}}</h3>
</div>
<div class="col-auto flex-center">
<div class="col-auto nopadding flex-center">
<button class="cd-btn-seeall" @click="app.appRoute('artist-feed')">{{app.getLz('term.seeAll')}}</button>
</div>
</div>
@ -63,10 +63,10 @@
<div class="row" v-if="friendsListeningTo && friendsListeningTo.length > 0">
<div class="col">
<div class="row">
<div class="col">
<div class="col nopadding">
<h3>{{app.getLz('home.friendsListeningTo')}}</h3>
</div>
<div class="col-auto flex-center">
<div class="col-auto nopadding flex-center">
<button class="cd-btn-seeall" @click="app.showSocialListeningTo()">{{app.getLz('term.seeAll')}}</button>
</div>
</div>