Merge remote-tracking branch 'origin/master'

This commit is contained in:
Roberto Tonino 2020-04-17 21:19:14 +02:00
commit 6b97eb2c5a
6 changed files with 28 additions and 25 deletions

View File

@ -130,6 +130,16 @@ button[disabled] {
opacity: 0.75;
}
button.selective {
background-color: var(--main-background);
color: var(--main-text);
}
button.selective.active {
background-color: var(--accent-color);
color: var(--accent-text);
}
input[type="text"],
input[type="password"],
input[type="number"] {

View File

@ -1,15 +1,4 @@
/* Main Search Tab */
.search_tablinks {
background-color: var(--main-background);
color: var(--main-text);
}
.search_tablinks.active {
background-color: var(--accent-color);
color: var(--accent-text);
}
#main_search>.search_section {
float: none;
}

View File

@ -0,0 +1,5 @@
#artist_tab header{
background-position: 0% 35%;
background-size: cover;
padding: 220px 24px 8px;
}

View File

@ -3,6 +3,7 @@
@import 'modules/sidebar.css';
@import 'modules/middle-section.css';
@import 'modules/tabs.css';
@import 'modules/stackedTabs.css';
@import 'modules/settings.css';
@import 'modules/main-search.css';
@import 'modules/download-tab.css';

View File

@ -247,17 +247,15 @@ <h1>Settings</h1>
<div id="about_tab" class="main_tabcontent"><h1>About</h1></div>
<div id="artist_tab" class="main_tabcontent fixed_footer">
<header>
<header v-bind:style="{ 'background-image': ' url(\''+image+'\')' }">
<h1>{{ title }}</h1>
<div class="fab"><i class="material-icons">get_app</i></div>
</header>
<div>
<ul id="artist-tabs">
<template v-for="(item, name, index) in body">
<li class="tab"><a v-bind:class="index==0 ? 'active' : ''" v-bind:href="'#artist_' + name" v-on:click="changeTab(name)">{{ name }}</a></li>
</template>
</ul>
<template v-for="(item, name, index) in body">
<button v-bind:class="'selective' + (name==currentTab ? 'active' : '')" v-bind:href="'#artist_' + name" v-on:click="changeTab(name)">{{ name }}</button>
</template>
</div>
<table>

View File

@ -2,28 +2,28 @@
<div id="search_tab" class="main_tabcontent">
<div class="tab">
<button
class="search_tablinks selective"
id="search_all_tab"
class="search_tablinks"
onclick="changeTab(event, 'search', 'main_search')"
>All</button>
<button
class="search_tablinks selective"
id="search_track_tab"
class="search_tablinks"
onclick="changeTab(event, 'search', 'track_search')"
>Tracks</button>
<button
class="search_tablinks selective"
id="search_album_tab"
class="search_tablinks"
onclick="changeTab(event, 'search', 'album_search')"
>Album</button>
<button
class="search_tablinks selective"
id="search_artist_tab"
class="search_tablinks"
onclick="changeTab(event, 'search', 'artist_search')"
>Artist</button>
<button
class="search_tablinks selective"
id="search_playlist_tab"
class="search_tablinks"
onclick="changeTab(event, 'search', 'playlist_search')"
>Playlist</button>
</div>