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

Merge Edge with data #1

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

16
base.css
View File

@ -21,18 +21,18 @@ main{
top: 0; top: 0;
width: 100%; width: 100%;
} }
.home-button{ .home-button, .sort-button{
display: inline-block; display: inline-block;
width: 76px; width: 64px;
height: 82px; height: 82px;
overflow: hidden; overflow: hidden;
text-align: center;
} }
.home-button > div{ .home-button > div, .sort-button > div{
display: inline; display: inline;
font-size: 60px; font-size: 60px;
padding: 12px 8px; padding: 10px;
vertical-align: middle; vertical-align: middle;
text-align: center;
} }
.nav{ .nav{
width: 100%; width: 100%;
@ -40,7 +40,7 @@ main{
overflow: hidden; overflow: hidden;
max-height: 0; max-height: 0;
} }
.nav-menu{ .nav-menu, .sort-menu, .duration-hold{
display: none; display: none;
} }
.menu a{ .menu a{
@ -104,7 +104,7 @@ main{
align-content: center; align-content: center;
width: 100%; width: 100%;
} }
.main-box > div{ .main-box > div, footer > p{
margin: 3px 0; margin: 3px 0;
padding: 2px; padding: 2px;
box-sizing: content-box; box-sizing: content-box;
@ -166,7 +166,7 @@ main{
margin: 2px; margin: 2px;
} }
@media (min-width: 540px){ @media (min-width: 540px){
.main-box > div{ .main-box > div, footer > p{
margin: 5px; margin: 5px;
} }
.item-table-360{ .item-table-360{

2
dark.css
View File

@ -12,7 +12,7 @@ a{
.home-button > div, .menu a{ .home-button > div, .menu a{
color: #e0e0e0; color: #e0e0e0;
} }
.home-button:hover, .menu a:hover, .hmb:hover{ .home-button:hover, .menu a:hover, .hmb:hover, .sort-button div, .sort-menu:checked ~ .sort-button div{
background-color: #606061; background-color: #606061;
} }
.hmb-line, .hmb-line::before, .hmb-line::after{ .hmb-line, .hmb-line::before, .hmb-line::after{

3
index.go.html
View File

@ -26,6 +26,8 @@
<a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><b>&#9737;</b></div></a> <a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><b>&#9737;</b></div></a>
{{ end }} {{ end }}
{{ end }} {{ end }}
<input class="sort-menu" type="checkbox" id="sort-menu"/>
<label class="sort-button no-dec" for="sort-menu"><div><b>&#8595;</b></div></label>
<input class="nav-menu" type="checkbox" id="nav-menu"/> <input class="nav-menu" type="checkbox" id="nav-menu"/>
<label class="hmb" for="nav-menu"><span class="hmb-line"></span></label> <label class="hmb" for="nav-menu"><span class="hmb-line"></span></label>
<nav class="nav"> <nav class="nav">
@ -93,6 +95,7 @@
</div> </div>
{{ end }} {{ end }}
</div> </div>
<div class="duration-hold">{{ .GetInt64Duration }}</div>
</div> </div>
{{ end }} {{ end }}
</main> </main>

2
light.css
View File

@ -12,7 +12,7 @@ a{
.home-button > div, .menu a{ .home-button > div, .menu a{
color: #1f1f1f; color: #1f1f1f;
} }
.home-button:hover, .menu a:hover, .hmb:hover{ .home-button:hover, .menu a:hover, .hmb:hover, .sort-button div, .sort-menu:checked ~ .sort-button div{
background-color: #9f9f9e; background-color: #9f9f9e;
} }
.hmb-line, .hmb-line::before, .hmb-line::after{ .hmb-line, .hmb-line::before, .hmb-line::after{

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

@ -55,6 +55,10 @@ func (ey EntryYaml) GetDuration() time.Duration {
return ey.GetEndTime().Sub(ey.StartDate.Time).Truncate(time.Second) return ey.GetEndTime().Sub(ey.StartDate.Time).Truncate(time.Second)
} }
func (ey EntryYaml) GetInt64Duration() int64 {
return int64(ey.GetDuration())
}
func (ey EntryYaml) GetImageCount() int { func (ey EntryYaml) GetImageCount() int {
return int(math.Min(math.Min(float64(len(ey.ThumbnailLocations)), float64(len(ey.ImageLocations))), float64(len(ey.ImageAltTexts)))) return int(math.Min(math.Min(float64(len(ey.ThumbnailLocations)), float64(len(ey.ImageLocations))), float64(len(ey.ImageAltTexts))))
} }