Prepare for merge

This commit is contained in:
2018-02-24 16:53:17 +01:00
43 changed files with 711 additions and 460 deletions

View File

@@ -35,7 +35,7 @@ figure.calendar {
min-height: 4.8em;
font-size: 0.8em;
color: #444;
overflow: hidden;
}
.calendar ul li.header {
@@ -57,7 +57,7 @@ figure.calendar {
.calendar ul li.active {
color: #222;
border-color: #456;
border-color: #679;
box-shadow: 0 0 3px #89f;
}
@@ -65,8 +65,31 @@ figure.calendar {
background-color: #fff;
}
.calendar ul li section::before {
content: "\26AB ";
color: #038;
.calendar ul li .day{
display: inline-block;
width: 1.75em;
height: 1.75em;
text-align: center;
line-height: 1.75em;
background: #9ab;
color: white;
border-radius: 0.875em;
margin-bottom: 0.1em;
font-size: 0.8em;
}
.calendar ul li.active .day{
background: #248;
}
.calendar ul li section {
line-height: 1.5em;
background: #038;
color: white;
border-radius: 0.75em;
text-align: center;
white-space: nowrap;
}
.calendar ul li section + section {
margin-top: 0.1em;
}

View File

@@ -1,8 +1,8 @@
h2 a {
h2 a, h4 a {
color: black;
text-decoration: none;
}
h2 a:hover {
h2 a:hover, h4 a:hover {
text-decoration: underline;
}
h2 em {
@@ -32,9 +32,19 @@ h2 img {
article:first-child h2 img {
max-width: 10em;
}
h4 {
margin-top: 0;
margin-bottom: -0.6em;
}
.subtext {
h2 + .subtext {
margin: -1.5em 0 1em 0;
}
p + .subtext {
margin: -0.5em 0 1em 0;
}
.subtext {
padding: 0;
list-style: none;
clear: left;
@@ -51,6 +61,38 @@ article:first-child h2 img {
font-weight: normal;
}
.events:before {
height: 1px;
width: 100%;
display: block;
content: " ";
background-image: -webkit-linear-gradient(left, transparent, rgba(0,0,0,.1), transparent);
background-image: -moz-linear-gradient(left, transparent, rgba(0,0,0,.1), transparent);
background-image: -o-linear-gradient(left, transparent, rgba(0,0,0,.1), transparent);
margin: 0;
padding: 0;
border: 0;
}
.events {
margin-top: -1.5em;
margin-left: 0.3em;
margin-bottom: 2em;
list-style: none;
padding: 0;
}
.events >li {
padding-left: 0.5em;
border-left: 4px solid #35a;
margin-top: 0.9em;
}
.events li p {
text-align: left;
}
.events .subtext {
margin-bottom: 0;
}
@media screen and (max-width: 50rem) {
h2 img {
display: none;

View File

@@ -1,5 +1,6 @@
header {
margin: 0;
margin-top: 3em;
padding: 3vh 15vw;
width: 70vw;
background-color: #002244;

View File

@@ -1,169 +0,0 @@
nav {
position: fixed;
z-index: 99;
top: 0;
width: 100vw;
height: 50px;
background-color: #002244;
overflow: hidden;
}
nav * {
background-color: #002244;
color: #fff;
margin: 0;
padding: 0;
}
nav h2 {
display: inline-block;
position: fixed;
top: 0;
margin-left: .65em;
line-height: 5vh;
color: #002244;
}
nav .logo{
position: fixed;
top: 6px;
left: 6px;
width: 38px;
height: 38px;
}
nav ul {
position: fixed;
top: 0;
left: 50px;
width: 100vw;
height: 45px;
list-style: none;
}
nav li {
height: 100%;
line-height: 50px;
}
nav a, nav p {
display: inline-block;
height: 40px;
margin: 0 .7em;
text-decoration: none;
font-size: 1.2em;
text-align: center;
border-bottom: 2px solid rgba(255, 255, 255, 0);
transition: border-bottom .3s ease;
}
nav a:hover {
border-bottom: 2px solid rgba(255, 255, 255, 1);
transition: border-bottom .3s ease;
}
nav a.active {
border-bottom: 2px solid rgba(255, 255, 255, 1);
transition: none;
}
nav .login {
position: fixed;
top: 0;
right: 0;
height: 45px;
line-height: 55px;
}
nav p.login {
right: .5em;
}
#navopen {
display: none;
}
@media(max-width: 800px){
nav .logo {
visibility: hidden;
}
nav .login {
display: none;
}
nav ul {
left: 0px;
height: 50px;
}
nav a {
display: none;
border-bottom: none;
text-align: left;
margin: 0;
}
nav a:hover {
border-bottom: none;
}
nav a.active {
display: block;
height: 50px;
line-height: 50px;
padding: 0 .5em;
border-bottom: none;
}
#navopen {
display: block;
position: fixed;
top: 0;
right: 0;
line-height: 50px;
text-align: center;
width: 50px;
height: 50px;
margin: 0;
padding: 0;
background-color: #002244;
}
.opennav a {
display: block;
text-align: left;
margin: 0;
padding: 0 .5em;
}
.opennav a:hover {
background-color: #00407F;
}
.opennav a:hover li {
background-color: #00407F;
}
.opennav a.active:hover {
background-color: #002244;
}
.opennav a.active:hover li {
background-color: #002244;
}
.opennav .login {
position: relative;
display: block;
border-top: 1px solid gray;
}
}

Binary file not shown.

BIN
www/css/raleway-latin.woff2 Normal file

Binary file not shown.

View File

@@ -1,3 +1,196 @@
/* latin-ext */
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 400;
src: local('Raleway'), local('Raleway-Regular'), url("/css/raleway-latin-ext.woff2") format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 400;
src: local('Raleway'), local('Raleway-Regular'), url() format('woff2');
src: local('Raleway'), local('Raleway-Regular'), url("/css/raleway-latin.woff2") format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;
}
h1, h2, h3, h4, h5, h6, li, a.btn, p.login{
font-family: Raleway, sans-serif;
font-style: normal;
font-variant: normal;
}
nav, #menu {
padding: 0;
}
nav {
background: #024;
position: absolute;
width: 100%;
top: 0;
left: 0;
right: 0;
height: 3em;
display: table;
white-space: nowrap;
}
nav #menu, nav #login {
display: table-cell;
}
nav #login, nav #usermenu a {
padding: 0 .75em;
margin: 0;
}
nav #login {
text-align: right;
}
nav #menu {
margin: .1em auto 0 auto;
text-align: center;
margin: 0;
z-index: 3; /* Make appear under #login */
width: 100%; /* Claim as much of the CSS table as possible */
}
nav li {
display: inline-block;
margin: auto .25em;
}
nav #menu_toggle {
margin: 0;
display: none;
}
nav li, nav #menu_toggle, nav #login {
line-height: 3em;
height: 3em;
}
nav a {
display: inline-block;
margin: auto;
color: white;
fill: white; /* SVG icon */
text-decoration: none;
margin: 0 .75em;
}
nav li.active, nav li:hover {
border-bottom: 2px solid white;
}
nav #usermenu {
display: none;
position: absolute;
top: 0;
right: 0;
margin: 0;
background: #fff;
padding: 0;
z-index: 5; /* Make appear over #login */
}
nav #login {
z-index: 4; /* Make appear under #usermenu and over #menu */
}
nav #usermenu li:first-child, nav #usermenu li:first-child a {
line-height: 3em;
height: 3em;
}
nav #usermenu li, nav #usermenu li a {
line-height: 2em;
height: 2em;
color: #024;
fill: #024; /* SVG icon */
border: none;
display: block;
margin: 0;
}
nav #usermenu:target {
display: block;
}
/* Style #login when #usermenu is targeted */
/* Requires #login to appear after #usermenu, directly under nav */
nav #usermenu:target ~ #login {
color: #024;
fill: #024; /* SVG icon */
background: white;
}
nav #usermenu li:hover {
background: #eee;
}
nav #usermenu li:first-child:hover {
background: transparent;
}
@media(max-width: 800px){
nav #menu, nav #menu li.active, nav #menu_toggle, nav #login {
position: absolute;
}
nav #menu li.active {
top: -3em; /* -3em for absolute, 0 for fixed.. huh? */
left: 0;
background: transparent;
}
nav li.active, nav li:hover {
border: none;
}
nav #menu {
text-align: left;
top: 3em;
left: 0;
right: 0;
padding: 0;
}
nav #menu:target {
top: 0;
padding-top: 3em;
}
nav #menu li, nav #menu li a {
margin-left: 0;
display: block;
}
nav #menu li a {
padding-left: 1em;
}
nav #menu li {
display: none;
background: #024;
}
nav #menu li:hover {
background: #1a3957;
}
nav #menu li.active:hover {
background: transparent;
}
nav #menu:target li.active:hover {
background: rgba(255,255,255,.1);
}
nav #menu:target li, nav #menu li.active {
display: block;
}
nav #menu_toggle {
display: block;
top: 0;
left: 0;
right: 0;
}
nav #menu:target li.active {
right: 0;
top: 0;
}
nav #menu_toggle {
text-align: center;
}
nav #menu_toggle:hover, nav #login:hover {
background: rgba(255,255,255,.1);
}
nav #login {
right: 0;
top: 0;
}
}
body {
overflow-y: scroll;
overflow-x: hidden;
@@ -17,6 +210,9 @@ main {
main h2 {
color: #002244;
z-index: 2; /* Make appear under #menu */
position: relative;
}
article {