template: a lot of small changes
This commit is contained in:
parent
f67f6e78c0
commit
9224c60766
GPG Key ID:
D126FA196DA0F362
|
|
@ -35,7 +35,9 @@ $orange: #ca5010
|
|||
$orangeLight: #d06228
|
||||
$red: #a4262c
|
||||
$redLight: #c50f1f
|
||||
$redOrange: #da3b01
|
||||
|
||||
@import "partials/normalize"
|
||||
@import "partials/main.sass"
|
||||
@import "partials/news.sass"
|
||||
@import "partials/color.sass"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ a
|
|||
.site-name
|
||||
background-color: #181818
|
||||
color: #18f018
|
||||
.mef
|
||||
color: $grey130
|
||||
.links
|
||||
a
|
||||
// Reset global rule
|
||||
|
|
@ -33,7 +35,7 @@ main
|
|||
background-color: $blue
|
||||
.error-badge
|
||||
color: white
|
||||
background-color: $orange
|
||||
background-color: $redOrange
|
||||
.button:hover
|
||||
background-color: $grey50
|
||||
.news-article
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ a
|
|||
font-weight: 400
|
||||
padding: 0 0.25em
|
||||
.mef
|
||||
opacity: 0.75
|
||||
font-size: 0.9em
|
||||
font-weight: 400
|
||||
img
|
||||
|
|
|
|||
|
|
@ -0,0 +1,349 @@
|
|||
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
|
||||
|
||||
/* Document
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Correct the line height in all browsers.
|
||||
* 2. Prevent adjustments of font size after orientation changes in iOS.
|
||||
*/
|
||||
|
||||
html {
|
||||
line-height: 1.15; /* 1 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */
|
||||
}
|
||||
|
||||
/* Sections
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the margin in all browsers.
|
||||
*/
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render the `main` element consistently in IE.
|
||||
*/
|
||||
|
||||
main {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the font size and margin on `h1` elements within `section` and
|
||||
* `article` contexts in Chrome, Firefox, and Safari.
|
||||
*/
|
||||
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
margin: 0.67em 0;
|
||||
}
|
||||
|
||||
/* Grouping content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Add the correct box sizing in Firefox.
|
||||
* 2. Show the overflow in Edge and IE.
|
||||
*/
|
||||
|
||||
hr {
|
||||
box-sizing: content-box; /* 1 */
|
||||
height: 0; /* 1 */
|
||||
overflow: visible; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inheritance and scaling of font size in all browsers.
|
||||
* 2. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
pre {
|
||||
font-family: monospace, monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
/* Text-level semantics
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the gray background on active links in IE 10.
|
||||
*/
|
||||
|
||||
a {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Remove the bottom border in Chrome 57-
|
||||
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
|
||||
*/
|
||||
|
||||
abbr[title] {
|
||||
border-bottom: none; /* 1 */
|
||||
text-decoration: underline; /* 2 */
|
||||
text-decoration: underline dotted; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct font weight in Chrome, Edge, and Safari.
|
||||
*/
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inheritance and scaling of font size in all browsers.
|
||||
* 2. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
samp {
|
||||
font-family: monospace, monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct font size in all browsers.
|
||||
*/
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent `sub` and `sup` elements from affecting the line height in
|
||||
* all browsers.
|
||||
*/
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
/* Embedded content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the border on images inside links in IE 10.
|
||||
*/
|
||||
|
||||
img {
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
/* Forms
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Change the font styles in all browsers.
|
||||
* 2. Remove the margin in Firefox and Safari.
|
||||
*/
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit; /* 1 */
|
||||
font-size: 100%; /* 1 */
|
||||
line-height: 1.15; /* 1 */
|
||||
margin: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the overflow in IE.
|
||||
* 1. Show the overflow in Edge.
|
||||
*/
|
||||
|
||||
button,
|
||||
input { /* 1 */
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the inheritance of text transform in Edge, Firefox, and IE.
|
||||
* 1. Remove the inheritance of text transform in Firefox.
|
||||
*/
|
||||
|
||||
button,
|
||||
select { /* 1 */
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the inability to style clickable types in iOS and Safari.
|
||||
*/
|
||||
|
||||
button,
|
||||
[type="button"],
|
||||
[type="reset"],
|
||||
[type="submit"] {
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the inner border and padding in Firefox.
|
||||
*/
|
||||
|
||||
button::-moz-focus-inner,
|
||||
[type="button"]::-moz-focus-inner,
|
||||
[type="reset"]::-moz-focus-inner,
|
||||
[type="submit"]::-moz-focus-inner {
|
||||
border-style: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the focus styles unset by the previous rule.
|
||||
*/
|
||||
|
||||
button:-moz-focusring,
|
||||
[type="button"]:-moz-focusring,
|
||||
[type="reset"]:-moz-focusring,
|
||||
[type="submit"]:-moz-focusring {
|
||||
outline: 1px dotted ButtonText;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the padding in Firefox.
|
||||
*/
|
||||
|
||||
fieldset {
|
||||
padding: 0.35em 0.75em 0.625em;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the text wrapping in Edge and IE.
|
||||
* 2. Correct the color inheritance from `fieldset` elements in IE.
|
||||
* 3. Remove the padding so developers are not caught out when they zero out
|
||||
* `fieldset` elements in all browsers.
|
||||
*/
|
||||
|
||||
legend {
|
||||
box-sizing: border-box; /* 1 */
|
||||
color: inherit; /* 2 */
|
||||
display: table; /* 1 */
|
||||
max-width: 100%; /* 1 */
|
||||
padding: 0; /* 3 */
|
||||
white-space: normal; /* 1 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
|
||||
*/
|
||||
|
||||
progress {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the default vertical scrollbar in IE 10+.
|
||||
*/
|
||||
|
||||
textarea {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Add the correct box sizing in IE 10.
|
||||
* 2. Remove the padding in IE 10.
|
||||
*/
|
||||
|
||||
[type="checkbox"],
|
||||
[type="radio"] {
|
||||
box-sizing: border-box; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the cursor style of increment and decrement buttons in Chrome.
|
||||
*/
|
||||
|
||||
[type="number"]::-webkit-inner-spin-button,
|
||||
[type="number"]::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the odd appearance in Chrome and Safari.
|
||||
* 2. Correct the outline style in Safari.
|
||||
*/
|
||||
|
||||
[type="search"] {
|
||||
-webkit-appearance: textfield; /* 1 */
|
||||
outline-offset: -2px; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the inner padding in Chrome and Safari on macOS.
|
||||
*/
|
||||
|
||||
[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inability to style clickable types in iOS and Safari.
|
||||
* 2. Change font properties to `inherit` in Safari.
|
||||
*/
|
||||
|
||||
::-webkit-file-upload-button {
|
||||
-webkit-appearance: button; /* 1 */
|
||||
font: inherit; /* 2 */
|
||||
}
|
||||
|
||||
/* Interactive
|
||||
========================================================================== */
|
||||
|
||||
/*
|
||||
* Add the correct display in Edge, IE 10+, and Firefox.
|
||||
*/
|
||||
|
||||
details {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add the correct display in all browsers.
|
||||
*/
|
||||
|
||||
summary {
|
||||
display: list-item;
|
||||
}
|
||||
|
||||
/* Misc
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Add the correct display in IE 10+.
|
||||
*/
|
||||
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct display in IE 10.
|
||||
*/
|
||||
|
||||
[hidden] {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/bash
|
||||
# Build static dependencies
|
||||
# Requires: postcss-cli, autoprefixer, minify (all from npm)
|
||||
# I recommend yarn global but do whatever you want
|
||||
|
||||
# Build auto-prefix-ed, minified CSS
|
||||
sass assets/csc-mirror.sass | postcss --use autoprefixer | minify --css > ./static/include/mirror-index-ng.css
|
||||
|
||||
# Compress CSS & JS assets
|
||||
# To be used alongside nginx's gzip-static module
|
||||
gzip -c ./static/include/htmx.min.js > ./static/include/htmx.min.js.gz
|
||||
gzip -c ./static/include/mirror-index-ng.css > ./static/include/mirror-index-ng.css.gz
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
#!/bin/bash
|
||||
# Deploy mirror index page
|
||||
# Note: This script is only used for deployment (commonly used in cron)
|
||||
# To build dependencies and do initial setup, run setup.sh
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
|
@ -15,5 +17,4 @@ hugo > /dev/null
|
|||
# Copy to mirror root
|
||||
cp public/index.html /mirror/root/index-new.html
|
||||
cp public/project_table/index.html /mirror/root/include/project_table.html
|
||||
cp public/include/* /mirror/root/include/
|
||||
cp -r public/news /mirror/root/
|
||||
|
|
|
|||
|
|
@ -24,10 +24,8 @@
|
|||
<meta name="description" content="{{ .Description }}" />
|
||||
{{- end -}}
|
||||
|
||||
{{- with resources.Get "csc-mirror.sass" | toCSS | resources.Minify -}}
|
||||
<style>{{ .Content | safeCSS }}</style>
|
||||
{{- end -}}
|
||||
|
||||
<link rel ="stylesheet" href="/include/mirror-index-ng.css">
|
||||
{{- block "stylesheet" . -}}
|
||||
{{- end -}}
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
<ul class="links hide-on-single-col">
|
||||
<li><a class="link" href="/">Mirror Home</a></li>
|
||||
<li><a class="link current">News</a></li>
|
||||
<li><span class="link current">News</span></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
<ul class="links hide-on-single-col">
|
||||
<li><a class="link" href="/">Mirror Home</a></li>
|
||||
<li><a class="link current">News</a></li>
|
||||
<li><span class="link current">News</span></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
{{ define "main" }}
|
||||
<div id="center">
|
||||
<header id="nav">
|
||||
<img class="logo" src="/include/logo-icon.svg">
|
||||
<img class="logo" alt="CSC Logo" src="/include/logo-icon.svg">
|
||||
<div class="title">
|
||||
<h1 class="club-name">University of Waterloo</h1>
|
||||
<br>
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
<h2 class="mef">
|
||||
Funded by
|
||||
<img src="/include/mef_logo.png" alt="MEF Logo">
|
||||
<a href="https://uwaterloo.ca/math-endowment-fund">Mathematics Endowment Fund</a>
|
||||
<a href="https://uwaterloo.ca/math-endowment-fund" class="mef-link">Mathematics Endowment Fund</a>
|
||||
</h2>
|
||||
</div>
|
||||
<ul class="links hide-on-single-col">
|
||||
<li><a class="link" href="https://csclub.uwaterloo.ca">Home</a></li>
|
||||
<li><a class="link" href="https://wiki.csclub.uwaterloo.ca">Wiki</a></li>
|
||||
<li><a class="link current">Mirror</a></li>
|
||||
<li><span class="link current" href="/">Mirror</span></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
</li>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
<a href="/news" style="display: block; margin-top: .8em; text-align: end">All News</a>
|
||||
</ul>
|
||||
<a href="/news" style="display: block; margin-top: .8em; text-align: end">All News</a>
|
||||
|
||||
<h2>Auto Refresh</h2>
|
||||
<p id="refresh-in" style="margin-top: .5em">Auto refresh disabled because JavaScript is disabled.</p>
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
{{ partial "footer" }}
|
||||
</div>
|
||||
<script src="https://unpkg.com/htmx.org@1.9.2"></script>
|
||||
<script src="/include/htmx.min.js"></script>
|
||||
<script>
|
||||
const sleep = ms => new Promise(r => setTimeout(r, ms));
|
||||
const refresh_in = document.getElementById('refresh-in');
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
while (true) {
|
||||
// Wait for 55s
|
||||
for (let i = 0; i < INTERVAL-5; i++) {
|
||||
refresh_in.innerHTML = "Mirror sync status will be refresh in " + (INTERVAL - 5 - i) + "s...";
|
||||
refresh_in.innerHTML = "Mirror sync status will be refreshed in " + (INTERVAL - 5 - i) + "s...";
|
||||
await sleep(1000);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<tr>
|
||||
<td><a href="/{{ .name }}" style="white-space: nowrap">{{ .name }}</a></td>
|
||||
<td><a href="{{ .status.url }}">{{ .status.url_short }}</a></td>
|
||||
<td id="last-successful-sync-time-{{ .name }}">
|
||||
<td>
|
||||
{{ if .status.upstream }}
|
||||
N/A
|
||||
{{ else if .status.last_successful_sync_time }}
|
||||
|
|
@ -29,9 +29,9 @@
|
|||
</td>
|
||||
<td>
|
||||
{{ if .status.is_running }}
|
||||
<span class="syncing-badge" id="syncing-badge-{{ .name }}">syncing</span>
|
||||
<span class="syncing-badge">syncing</span>
|
||||
{{ else if (and (not .status.last_sync_success) (not .status.upstream)) }}
|
||||
<span class="error-badge" id="error-badge-{{ .name }}">error</span>
|
||||
<span class="error-badge">error</span>
|
||||
{{ end }}
|
||||
</td>
|
||||
<td class="project-size">{{ .status.size_human }}</td>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
#!/bin/bash
|
||||
# Setup mirror-index-ng
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Create directories
|
||||
mkdir data
|
||||
|
||||
# Copy assets to destination
|
||||
cp public/include/* /mirror/root/include/
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in New Issue