aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Wilken2020-07-14 00:11:11 +0100
committerTimo Wilken2020-07-14 00:11:11 +0100
commitb87eb12fb3bc10c42684881fba096ce2d7425edc (patch)
tree99e794bac42f8dcd68c540d857e4a937e1d0b17f
parent1c81e06d3160ff40dd8ae8856c89dfbab918333c (diff)
Tweak footer; fix CSS lint warnings.HEADmaster
-rw-r--r--public/style.css2
-rw-r--r--public/style.less18
-rw-r--r--views/partial/footer.ejs7
3 files changed, 17 insertions, 10 deletions
diff --git a/public/style.css b/public/style.css
index 7993ee7..1906c72 100644
--- a/public/style.css
+++ b/public/style.css
@@ -1 +1 @@
-body{margin:0;padding:1em;font-family:-apple-system,BlinkMacSystemFont,sans-serif;font-size:1em}a{color:#2980b9}a:hover{color:#20638f}abbr{cursor:help;text-decoration:underline dotted;border:none}dt{font-weight:bold;margin-top:.5em}h1,h2,h3,h4,h5,h6{font-family:serif}h1{font-size:3em;font-weight:300}h2{font-size:2.5em;font-weight:400}h3{font-size:2em;font-weight:500}h4{font-size:1.5em;font-weight:600}h5{font-size:1.3em;font-weight:700}h6{font-size:1em;font-weight:800}button,input[type="submit"],input[type="button"]{cursor:pointer;background-color:#c4342d;color:white;border:none;border-radius:.4em;padding:.5em 1em;transition:background-color 250ms ease-out,color 250ms ease-out}button:hover,input[type="submit"]:hover,input[type="button"]:hover,button:active,input[type="submit"]:active,input[type="button"]:active{background-color:#9b2923}.success-box,.error-box{border-left-width:.5em;border-left-style:solid;color:white;padding:1em;margin-bottom:1em}.success-box a,.error-box a{color:inherit}.success-box h5,.error-box h5{margin-top:0;margin-bottom:.5em}.success-box h5::before,.error-box h5::before{margin-right:.5em;font-weight:bold}.success-box .contact,.error-box .contact{font-size:.875em;opacity:85%;text-align:right;padding-top:1em}.success-box{background-color:#27ae60;border-left-color:#2ecc71}.success-box h5::before{content:"\2713"}.error-box{border-left-color:#e67e22;background-color:#d35400}.error-box h5::before{content:"\26a0"}.explanation{opacity:60%}.explanation-row td{text-align:left}.submit-container{display:flex;flex-flow:row wrap;margin-top:1em;justify-content:space-between;align-items:center}.submit-container>*{flex:0 0 auto;white-space:nowrap;margin:.5em}.submit-container label{display:block}.submit-container #booking-description{flex:1 1 auto}.calendar-key{display:flex;flex-flow:row wrap}.calendar-key div{flex:1 0;padding:.5em 1em;margin:.2em;color:white;text-align:center;white-space:nowrap}.calendar-key .available{background-color:#ecf0f1;color:black}.calendar-key .selected{background-color:#2980b9}.calendar-key .booked{background-color:#27ae60}.calendar-key .taken{background-color:#8e44ad}.calendar-key .available,.calendar-key .selected{font-style:italic}table{border-collapse:collapse}table th{white-space:nowrap;padding:.5em 1em;background-color:#c4342d;color:white}table td label:only-child{display:block}.calendar-container{overflow-x:auto}form:not(.booking-form){border-left:.2em solid #c4342d;padding-left:1em}form table input[type="text"],#settings-form input[type="text"]{box-sizing:border-box;width:100%}#settings-form input[type="text"]{font-family:monospace}form table{width:100%}form table th,form table td{text-align:center;padding-top:.5em;padding-bottom:.5em}.toggle-button>input[type="checkbox"]{display:none}.toggle-button>.text{cursor:pointer;border:none;padding:.5em 1em;transition:background 250ms ease-out,border-left-color 250ms ease-out;text-align:center}.calendar .slot{border:0;padding:0 .1em;margin:0;height:100%}.calendar .slot .add-button>.text{background-color:#ecf0f1;color:black;font-style:italic}.calendar .slot .add-button>.text::before{content:"available"}.calendar .slot .delete-button>.text{background-color:#27ae60;color:white;font-weight:bold}.calendar .slot .delete-button>.text::before{content:"\00d7"}.calendar .slot .add-button>input[type="checkbox"]:checked+.text{background-color:#2980b9;color:white}.calendar .slot .add-button>input[type="checkbox"]:checked+.text::before{content:"selected"}.calendar .slot .delete-button>input[type="checkbox"]:checked+.text{background-color:#c0392b}.calendar .slot .booking{background-color:#8e44ad;color:white;display:flex;flex-flow:row nowrap}.calendar .slot .booking.own-booking{background-color:#27ae60}.calendar .slot .booking .booking-name{flex:1 0;text-align:center;padding:.5em .2em}.calendar .slot .booking .delete-button{flex:0 0}#own-bookings-form .delete-booking>input[type="checkbox"]+.text{margin:0 1em;background-color:#ecf0f1;color:black;font-style:italic}#own-bookings-form .delete-booking>input[type="checkbox"]+.text::before{content:"keep"}#own-bookings-form .delete-booking>input[type="checkbox"]:checked+.text{background-color:#c0392b;color:white;font-style:normal}#own-bookings-form .delete-booking>input[type="checkbox"]:checked+.text::before{content:"delete"}.button-link-list{display:flex;flex-flow:column wrap;padding:0;margin:0}.button-link-list>li{display:block;flex:1 1 auto;list-style:none;padding:0;margin:.5em}.button-link-list>li>a{display:block;text-decoration:none;padding:.75em 1em;margin:0 0;border-radius:.4em;background-color:#c4342d;color:white;transition:background-color 250ms ease-out,color 250ms ease-out;white-space:nowrap}.button-link-list>li>a:hover{background-color:#9b2923}.navheader .button-link-list{display:flex;flex-flow:row wrap;background-color:#c4342d;margin:-1em;margin-bottom:0;padding:0}.navheader .button-link-list>li{flex:0 0}.navheader .button-link-list>li:first-child{margin-right:auto;font-weight:bold}#block-bookings-form p{margin:2em 0}.alternative-rows{margin:1em 0}.alternative-rows .row{display:flex;flex-flow:row wrap;padding:1em 0}.alternative-rows .row>input[type="radio"]:first-child{flex:0 0;margin:0 .5em}.alternative-rows .row>div{flex:1 1}.alternative-rows .row>input[type="radio"]:first-child:not(:checked)+div::before{opacity:60%;font-size:.875em;content:"(select to use this option)"}footer{margin-top:1.5em;border-top:.2em solid #c4342d;padding-top:1em;text-align:center} \ No newline at end of file
+body{margin:0;padding:1em;font-family:-apple-system,BlinkMacSystemFont,sans-serif;font-size:1em}a{color:#2980b9}a:hover{color:#20638f}abbr{cursor:help;text-decoration:underline dotted;border:none}dt{font-weight:bold;margin-top:.5em}h1,h2,h3,h4,h5,h6{font-family:serif}h1{font-size:3em;font-weight:300}h2{font-size:2.5em;font-weight:400}h3{font-size:2em;font-weight:500}h4{font-size:1.5em;font-weight:600}h5{font-size:1.3em;font-weight:700}h6{font-size:1em;font-weight:800}button,input[type="submit"],input[type="button"]{cursor:pointer;background-color:#c4342d;color:white;border:none;border-radius:.4em;padding:.5em 1em;transition:background-color 250ms ease-out,color 250ms ease-out}button:hover,input[type="submit"]:hover,input[type="button"]:hover,button:active,input[type="submit"]:active,input[type="button"]:active{background-color:#9b2923}.success-box,.error-box{border-left-width:.5em;border-left-style:solid;color:white;padding:1em;margin-bottom:1em}.success-box a,.error-box a{color:inherit}.success-box h5,.error-box h5{margin-top:0;margin-bottom:.5em}.success-box h5::before,.error-box h5::before{margin-right:.5em;font-weight:bold}.success-box .contact,.error-box .contact{font-size:.875em;opacity:85%;text-align:right;padding-top:1em}.success-box{background-color:#27ae60;border-left-color:#2ecc71}.success-box h5::before{content:"\2713"}.error-box{border-left-color:#e67e22;background-color:#d35400}.error-box h5::before{content:"\26a0"}.explanation{opacity:60%}.submit-container{display:flex;flex-flow:row wrap;margin-top:1em;justify-content:space-between;align-items:center}.submit-container>*{flex:0 0 auto;white-space:nowrap;margin:.5em}.submit-container label{display:block}.submit-container #booking-description{flex:1 1 auto}.calendar-key{display:flex;flex-flow:row wrap}.calendar-key div{flex:1 0;padding:.5em 1em;margin:.2em;color:white;text-align:center;white-space:nowrap}.calendar-key .available{background-color:#ecf0f1;color:black}.calendar-key .selected{background-color:#2980b9}.calendar-key .booked{background-color:#27ae60}.calendar-key .taken{background-color:#8e44ad}.calendar-key .available,.calendar-key .selected{font-style:italic}table{border-collapse:collapse}table th{white-space:nowrap;padding:.5em 1em;background-color:#c4342d;color:white}table td label:only-child{display:block}.calendar-container{overflow-x:auto}form:not(.booking-form){border-left:.2em solid #c4342d;padding-left:1em}form table input[type="text"],#settings-form input[type="text"]{box-sizing:border-box;width:100%}form table{width:100%}form table th,form table td{text-align:center;padding-top:.5em;padding-bottom:.5em}.toggle-button>input[type="checkbox"]{display:none}.toggle-button>.text{cursor:pointer;border:none;padding:.5em 1em;transition:background 250ms ease-out,border-left-color 250ms ease-out;text-align:center}.calendar .slot{border:0;padding:0 .1em;margin:0;height:100%}.calendar .slot .add-button>.text{background-color:#ecf0f1;color:black;font-style:italic}.calendar .slot .add-button>.text::before{content:"available"}.calendar .slot .delete-button>.text{background-color:#27ae60;color:white;font-weight:bold}.calendar .slot .delete-button>.text::before{content:"\00d7"}.calendar .slot .add-button>input[type="checkbox"]:checked+.text{background-color:#2980b9;color:white}.calendar .slot .add-button>input[type="checkbox"]:checked+.text::before{content:"selected"}.calendar .slot .delete-button>input[type="checkbox"]:checked+.text{background-color:#c0392b}.calendar .slot .booking{background-color:#8e44ad;color:white;display:flex;flex-flow:row nowrap}.calendar .slot .booking.own-booking{background-color:#27ae60}.calendar .slot .booking .booking-name{flex:1 0;text-align:center;padding:.5em .2em}.calendar .slot .booking .delete-button{flex:0 0}#own-bookings-form .delete-booking>input[type="checkbox"]+.text{margin:0 1em;background-color:#ecf0f1;color:black;font-style:italic}#own-bookings-form .delete-booking>input[type="checkbox"]+.text::before{content:"keep"}#own-bookings-form .delete-booking>input[type="checkbox"]:checked+.text{background-color:#c0392b;color:white;font-style:normal}#own-bookings-form .delete-booking>input[type="checkbox"]:checked+.text::before{content:"delete"}.button-link-list{display:flex;flex-flow:column wrap;padding:0;margin:0}.button-link-list>li{display:block;flex:1 1 auto;list-style:none;padding:0;margin:.5em}.button-link-list>li>a{display:block;text-decoration:none;padding:.75em 1em;margin:0 0;border-radius:.4em;background-color:#c4342d;color:white;transition:background-color 250ms ease-out,color 250ms ease-out;white-space:nowrap}.button-link-list>li>a:hover{background-color:#9b2923}.navheader .button-link-list{display:flex;flex-flow:row wrap;background-color:#c4342d;margin:-1em;margin-bottom:0;padding:0}.navheader .button-link-list>li{flex:0 0}.navheader .button-link-list>li:first-child{margin-right:auto;font-weight:bold}.alternative-rows{margin:1em 0}.alternative-rows .row{display:flex;flex-flow:row wrap;padding:1em 0}.alternative-rows .row>input[type="radio"]:first-child{flex:0 0;margin:0 .5em}.alternative-rows .row>div{flex:1 1}.alternative-rows .row>input[type="radio"]:first-child:not(:checked)+div::before{opacity:60%;font-size:.875em;content:"(select to use this option)"}footer{margin-top:2.5em;border-top:.2em solid #c4342d;padding-top:1em;text-align:center}footer p{opacity:60%;font-size:smaller}.explanation-row td{text-align:left}#block-bookings-form p{margin:2em 0}#settings-form input[type="text"]{font-family:monospace} \ No newline at end of file
diff --git a/public/style.less b/public/style.less
index 249b2f9..e10dc13 100644
--- a/public/style.less
+++ b/public/style.less
@@ -35,6 +35,7 @@ dt {
margin-top: 0.5em;
}
+// stylelint-disable
h1, h2, h3, h4, h5, h6 { font-family: serif; }
h1 { font-size: 3.0em; font-weight: 300; }
h2 { font-size: 2.5em; font-weight: 400; }
@@ -42,6 +43,7 @@ h3 { font-size: 2.0em; font-weight: 500; }
h4 { font-size: 1.5em; font-weight: 600; }
h5 { font-size: 1.3em; font-weight: 700; }
h6 { font-size: 1.0em; font-weight: 800; }
+// stylelint-enable
button,
input[type="submit"],
@@ -101,7 +103,6 @@ input[type="button"] {
}
.explanation { opacity: 60%; }
-.explanation-row td { text-align: left; }
.submit-container {
display: flex;
@@ -172,8 +173,6 @@ form table input[type="text"],
width: 100%;
}
-#settings-form input[type="text"] { font-family: monospace; }
-
form table {
width: 100%;
@@ -315,8 +314,6 @@ form table {
}
}
-#block-bookings-form p { margin: 2em 0; }
-
.alternative-rows {
margin: 1em 0;
@@ -341,8 +338,17 @@ form table {
}
footer {
- margin-top: 1.5em;
+ margin-top: 2.5em;
border-top: 0.2em solid @primary;
padding-top: 1em;
text-align: center;
+
+ p {
+ opacity: 60%;
+ font-size: smaller;
+ }
}
+
+.explanation-row td { text-align: left; }
+#block-bookings-form p { margin: 2em 0; }
+#settings-form input[type="text"] { font-family: monospace; }
diff --git a/views/partial/footer.ejs b/views/partial/footer.ejs
index 3ca776e..49d4a69 100644
--- a/views/partial/footer.ejs
+++ b/views/partial/footer.ejs
@@ -1,7 +1,8 @@
<footer>
- <small class="explanation">
- Created by <a href="mailto:tw466@cam.ac.uk">Timo Wilken</a>. In case of problems, contact
+ <p>
+ In case of problems, contact
<a href="mailto:jcr.comms@caths.cam.ac.uk">jcr.comms@caths.cam.ac.uk</a> or
<a href="mailto:mcr.computing@caths.cam.ac.uk">mcr.computing@caths.cam.ac.uk</a>.
- </small>
+ </p>
+ <p>Created by <a href="mailto:tw466@cam.ac.uk">Timo Wilken</a>.</p>
</footer>