Compare commits

...

5 Commits

Author SHA1 Message Date
a58f9fae3a
.
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is passing
2022-07-28 01:40:45 +01:00
41c5e37a07
.
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-28 01:36:58 +01:00
04f2f1105b
.
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-28 01:33:51 +01:00
c649064ae3
.
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-28 01:28:05 +01:00
493f73c8d2
.
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-28 01:20:29 +01:00
4 changed files with 42 additions and 3 deletions

View File

@ -60,7 +60,7 @@ main{
vertical-align: middle; vertical-align: middle;
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
padding: 0 2px; padding: 2px;
} }
.so-pane > label{ .so-pane > label{
background-color: transparent; background-color: transparent;
@ -117,8 +117,9 @@ main{
box-sizing: content-box; box-sizing: content-box;
position: fixed; position: fixed;
top: 85px; top: 85px;
max-height: 100%;
width: auto; width: auto;
height: 24px; height: auto;
padding: 4px; padding: 4px;
text-align: center; text-align: center;
border-style: solid; border-style: solid;
@ -216,6 +217,9 @@ main{
border-width: 4px; border-width: 4px;
margin: 10px; margin: 10px;
} }
.small-only-row{
display: none !important;
}
} }
@media (min-width: 640px){ @media (min-width: 640px){
.nav{ .nav{

View File

@ -27,7 +27,7 @@
{{ end }} {{ end }}
{{ end }} {{ end }}
<input class="sort-menu" type="checkbox" id="sort-menu"/> <input class="sort-menu" type="checkbox" id="sort-menu"/>
<label class="sort-button no-dec" for="sort-menu" title="Order and Sort Options"><div><b>&#8595;</b></div></label> <label class="sort-button no-dec" for="sort-menu" title="Order and Sort Options"><div><img src="{{ .Data.SortImageLocation }}" width="64px" alt='&#8595;'></div></label>
<form class="so-pane" action="?" method="get" id="so-form"> <form class="so-pane" action="?" method="get" id="so-form">
{{ if .Light }} {{ if .Light }}
<input id="so-theme" type="hidden" name="light" /> <input id="so-theme" type="hidden" name="light" />
@ -96,6 +96,11 @@
<div class="centered"><h4>Email: <a href="mailto:{{ .Data.About.ContactEmail }}">{{ .Data.About.ContactEmail }}</a></h4></div> <div class="centered"><h4>Email: <a href="mailto:{{ .Data.About.ContactEmail }}">{{ .Data.About.ContactEmail }}</a></h4></div>
</div> </div>
</div> </div>
<div class="small-only-row">
<div class="item-table-full">
<div class="centered"><h4>Email: <a href="mailto:{{ .Data.About.ContactEmail }}">{{ .Data.About.ContactEmail }}</a></h4></div>
</div>
</div>
<div> <div>
<div class="item-table-full"> <div class="item-table-full">
<div class="content">{{ .Data.About.GetContent }}</div> <div class="content">{{ .Data.About.GetContent }}</div>
@ -104,6 +109,11 @@
<div><a href="{{ .Data.About.ImageLocation }}"><img src="{{ .Data.About.ThumbnailLocation }}" alt="{{ .Data.About.ImageAltText }}" title="{{ .Data.About.ImageAltText }}" width="360px"></a></div> <div><a href="{{ .Data.About.ImageLocation }}"><img src="{{ .Data.About.ThumbnailLocation }}" alt="{{ .Data.About.ImageAltText }}" title="{{ .Data.About.ImageAltText }}" width="360px"></a></div>
</div> </div>
</div> </div>
<div class="small-only-row">
<div class="item-table-full">
<div class="centered"><a href="{{ .Data.About.ImageLocation }}"><img src="{{ .Data.About.ThumbnailLocation }}" alt="{{ .Data.About.ImageAltText }}" title="{{ .Data.About.ImageAltText }}" width="360px"></a></div>
</div>
</div>
</div> </div>
</div> </div>
{{ range .GetEntries }} {{ range .GetEntries }}
@ -121,6 +131,15 @@
{{ end }} {{ end }}
</div> </div>
</div> </div>
<div class="small-only-row">
<div class="item-table-full">
{{ if eq .GetStartDate .GetEndDate }}
<div class="centered"><h4>{{ .GetStartDate }}</h4></div>
{{ else }}
<div class="centered"><h4>{{ .GetStartDate }} - {{ .GetEndDate }}</h4></div>
{{ end }}
</div>
</div>
<div> <div>
<div class="item-table-full"> <div class="item-table-full">
<div class="content">{{ .GetContent }}</div> <div class="content">{{ .GetContent }}</div>
@ -138,6 +157,20 @@
</div> </div>
</div> </div>
</div> </div>
<div class="small-only-row">
<div class="item-table-full">
<div class="centered">
{{ if eq .VideoLocation "" }}
<img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video" width="360px">
{{ else }}
<video controls width="360px">
<source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
<a href="{{ .VideoLocation }}">The Video</a>
</video>
{{ end }}
</div>
</div>
</div>
{{ if not (eq .GetImageCount 0) }} {{ if not (eq .GetImageCount 0) }}
<div class="item-table-caption"> <div class="item-table-caption">
<div class="image-box"> <div class="image-box">

View File

@ -8,6 +8,7 @@ noVideoImageLocation: "https://cityuni.captainalm.com/resources/assets/novideo.p
logoImageLocation: "https://cityuni.captainalm.com/resources/assets/logo.png" logoImageLocation: "https://cityuni.captainalm.com/resources/assets/logo.png"
moonImageLocation: "https://cityuni.captainalm.com/resources/assets/moon.png" moonImageLocation: "https://cityuni.captainalm.com/resources/assets/moon.png"
sunImageLocation: "https://cityuni.captainalm.com/resources/assets/sun.png" sunImageLocation: "https://cityuni.captainalm.com/resources/assets/sun.png"
sortImageLocation: "https://cityuni.captainalm.com/resources/assets/sort.png"
headerLinks: headerLinks:
Main Portfolio: "https://portfolio.captainalm.com/" Main Portfolio: "https://portfolio.captainalm.com/"
Root Site Home: "https://www.captainalm.com/" Root Site Home: "https://www.captainalm.com/"

View File

@ -12,6 +12,7 @@ type DataYaml struct {
LogoImageLocation template.URL `yaml:"logoImageLocation"` LogoImageLocation template.URL `yaml:"logoImageLocation"`
SunImageLocation template.URL `yaml:"sunImageLocation"` SunImageLocation template.URL `yaml:"sunImageLocation"`
MoonImageLocation template.URL `yaml:"moonImageLocation"` MoonImageLocation template.URL `yaml:"moonImageLocation"`
SortImageLocation template.URL `yaml:"sortImageLocation"`
About AboutYaml `yaml:"about"` About AboutYaml `yaml:"about"`
Entries []EntryYaml `yaml:"entries"` Entries []EntryYaml `yaml:"entries"`
} }