Merge Edge with sort and resize #2

Merged
alfred merged 64 commits from edge into master 2022-07-28 01:51:14 +01:00
4 changed files with 19 additions and 10 deletions
Showing only changes of commit 9876cbd64c - Show all commits

View File

@ -58,10 +58,13 @@ main{
} }
.so-pane > *{ .so-pane > *{
font-size: 24px; font-size: 24px;
text-align: center; text-align: left;
width: 180px; width: 180px;
padding: 0 1px; padding: 0 1px;
} }
.so-pane > label{
background-color: transparent;
}
.nav-menu, .sort-menu, .data-hold{ .nav-menu, .sort-menu, .data-hold{
display: none; display: none;
} }
@ -121,7 +124,7 @@ main{
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 2px;
} }
.main-box{ .main-box{
display: -webkit-box; display: -webkit-box;

View File

@ -1,4 +1,4 @@
body, .so-pane > *{ body{
color: #f9f9f9; color: #f9f9f9;
background-color: #050506; background-color: #050506;
border-color: #696969; border-color: #696969;
@ -9,10 +9,10 @@ a{
.header, .nav, footer, .so-pane{ .header, .nav, footer, .so-pane{
background-color: #1d1d1e; background-color: #1d1d1e;
} }
.home-button > div, .sort-button > div, .menu a{ .home-button > div, .sort-button > div, .menu a, .so-pane > *{
color: #e0e0e0; color: #e0e0e0;
} }
.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button{ .home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button, .so-pane > input, .so-pane > select{
background-color: #606061; background-color: #606061;
} }
.hmb-line, .hmb-line::before, .hmb-line::after{ .hmb-line, .hmb-line::before, .hmb-line::after{

View File

@ -33,6 +33,7 @@
<input id="so-theme" type="hidden" name="light" /> <input id="so-theme" type="hidden" name="light" />
{{ end }} {{ end }}
{{ $sort := 0 }} {{ $sort := 0 }}
<p>
<label class="no-dec" for="so-order">Order by:</label> <label class="no-dec" for="so-order">Order by:</label>
<select name="order" id="so-order"> <select name="order" id="so-order">
{{ if eq .OrderStartDate 0 }} {{ if eq .OrderStartDate 0 }}
@ -60,20 +61,25 @@
{{ $sort = .OrderDuration }} {{ $sort = .OrderDuration }}
{{ end }} {{ end }}
</select> </select>
</p>
<p>
<label class="no-dec" for="so-sort">Sort:</label> <label class="no-dec" for="so-sort">Sort:</label>
<select name="sort" id="so-sort"> <select name="sort" id="so-sort">
{{ if lt $sort 0 }} {{ if gt $sort 0 }}
<option value="asc" selected>Ascending</option> <option value="asc" selected>Ascending</option>
{{ else }} {{ else }}
<option value="asc">Ascending</option> <option value="asc">Ascending</option>
{{ end }} {{ end }}
{{ if gt $sort 0 }} {{ if lt $sort 0 }}
<option value="desc" selected>Descending</option> <option value="desc" selected>Descending</option>
{{ else }} {{ else }}
<option value="desc">Descending</option> <option value="desc">Descending</option>
{{ end }} {{ end }}
</select> </select>
</p>
<p>
<input id="so-submit" type="submit" value="Commit"> <input id="so-submit" type="submit" value="Commit">
</p>
</form> </form>
<input class="nav-menu" type="checkbox" id="nav-menu"/> <input class="nav-menu" type="checkbox" id="nav-menu"/>
<label class="hmb" for="nav-menu" title="Navigation Links"><span class="hmb-line"></span></label> <label class="hmb" for="nav-menu" title="Navigation Links"><span class="hmb-line"></span></label>

View File

@ -1,4 +1,4 @@
body, .so-pane > *{ body{
color: #060606; color: #060606;
background-color: #fafaf9; background-color: #fafaf9;
border-color: #969696; border-color: #969696;
@ -9,10 +9,10 @@ a{
.header, .nav, footer, .so-pane{ .header, .nav, footer, .so-pane{
background-color: #e2e2e1; background-color: #e2e2e1;
} }
.home-button > div, .sort-button > div, .menu a{ .home-button > div, .sort-button > div, .menu a, .so-pane > *{
color: #1f1f1f; color: #1f1f1f;
} }
.home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button{ .home-button:hover, .menu a:hover, .hmb:hover, .sort-button:hover, .sort-menu:checked ~ .sort-button, .so-pane > input, .so-pane > select{
background-color: #9f9f9e; background-color: #9f9f9e;
} }
.hmb-line, .hmb-line::before, .hmb-line::after{ .hmb-line, .hmb-line::before, .hmb-line::after{