Merge branch 'main' into 'implement-js'

# Conflicts:
#   src/main/resources/templates/index.html
This commit is contained in:
Julian Klinke
2024-06-20 15:59:55 +02:00
3 changed files with 21 additions and 16 deletions

View File

@@ -27,7 +27,7 @@
<option>Votes ↓</option>
</select>
<div class="divider"></div>
<select class="btn" id="filter-btn" title="Filter entries">Filter
<select class="btn flat" id="filter-btn" title="Filter entries">Filter
<optgroup label="Standard categories">
<option>Option 1</option>
<option>Option 2</option>
@@ -37,7 +37,7 @@
</optgroup>
</select>
<input type="search" name="query" id="search-entry" placeholder="Search">
<button class="btn" id="search-btn" title="Search entries">Search</button>
<button class="btn flat" id="search-btn" title="Search entries">Search</button>
</section>
<section id="recents">
@@ -53,9 +53,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
<li class="dataset">
@@ -67,9 +67,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
<li class="dataset">
@@ -81,9 +81,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
<li class="dataset">
@@ -95,9 +95,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
<li class="dataset">
@@ -109,9 +109,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
</ul>
@@ -128,9 +128,9 @@
</div>
</div>
<aside class="upvote">
<button class="upvote-btn btn">Upvote</button>
<button class="upvote-btn btn flat">Upvote</button>
<span class="upvote-count">0</span>
<button class="downvote-btn btn">Downvote</button>
<button class="downvote-btn btn flat">Downvote</button>
</aside>
</li>
</ul>