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

Fix merge mistake

Browse source
This commit is contained in:
Pedro Galhardo 2022-06-26 00:34:34 +01:00
parent 2911667a99
commit cefe333055
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/renderer/views/pages/cider-playlist.ejs
View file

@ -108,25 +108,11 @@
{{app.getLz('term.confirm')}} {{app.getLz('term.confirm')}}
</button> </button>
<div style="display: flex; float: right;"> <div style="display: flex; float: right;">
<<<<<<< HEAD
<button :class="['search-btn', showSearch ? 'active' : '']" <button :class="['search-btn', showSearch ? 'active' : '']"
@click="toggleSearch()" @click="toggleSearch()"
:aria-label="showSearch ? app.getLz('term.hideSearch') : app.getLz('term.showSearch')"> :aria-label="showSearch ? app.getLz('term.hideSearch') : app.getLz('term.showSearch')">
<img :src="showSearch ? './assets/search-alt.svg' : './assets/search.svg'"> <img :src="showSearch ? './assets/search-alt.svg' : './assets/search.svg'">
</button> </button>
=======
<div class="search-input-container" style="margin-right: 8px;">
<div class="search-input--icon"></div>
<input type="search"
style="width:100%;"
spellcheck="false"
:placeholder="$root.getLz('term.search') + '...'"
@input="search()"
:style="{ '--heroplaceholdercolor': '#' +hasHeroObject()?.textColor4 ?? ''}"
v-model="searchQuery"
class="search-input">
</div>
>>>>>>> main
<button class="more-btn-round" @click="menu" :aria-label="app.getLz('term.more')"> <button class="more-btn-round" @click="menu" :aria-label="app.getLz('term.more')">
<div class="svg-icon"></div> <div class="svg-icon"></div>
</button> </button>