alfred/cityuni-webserver
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge Edge with sort and resize #2

Merged
alfred merged 64 commits from edge into master 2022-07-28 01:51:14 +01:00
Conversation 0 Commits 64 Files Changed 16 +10 -17
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76cbb19317 - Show all commits

11
base.css
View File

@ -56,13 +56,12 @@ main{
position: fixed; position: fixed;
max-height: 0; max-height: 0;
} }
.so-pane > p > *{ .so-pane > *{
font-size: 24px; font-size: 16px;
text-align: left; text-align: left;
width: 180px;
padding: 0 1px; padding: 0 1px;
} }
.so-pane > p > label{ .so-pane > label{
background-color: transparent; background-color: transparent;
} }
.nav-menu, .sort-menu, .data-hold{ .nav-menu, .sort-menu, .data-hold{
@ -117,9 +116,9 @@ main{
box-sizing: content-box; box-sizing: content-box;
position: fixed; position: fixed;
top: 85px; top: 85px;
max-height: 96px; max-height: 24px;
width: 360px; width: 360px;
height: 96px; height: 24px;
padding: 4px; padding: 4px;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;

4
dark.css
View File

@ -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, .so-pane > p > *{ .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, .so-pane > p > input, .so-pane > p > select{ .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{

6
index.go.html
View File

@ -33,7 +33,6 @@
<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 }}
@ -61,8 +60,6 @@
{{ $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 gt $sort 0 }} {{ if gt $sort 0 }}
@ -76,10 +73,7 @@
<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>

4
light.css
View File

@ -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, .so-pane > p > *{ .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, .so-pane > p > input, .so-pane > p > select{ .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{

2
pageHandler/pages/index/entry.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
) )
const dateFormat = "01-2006" const dateFormat = "01/2006"
type EntryYaml struct { type EntryYaml struct {
Name string `yaml:"name"` Name string `yaml:"name"`