diff --git a/.github/workflows/pa11y.yaml b/.github/workflows/pa11y.yaml index 09b0bdd4..a6063897 100644 --- a/.github/workflows/pa11y.yaml +++ b/.github/workflows/pa11y.yaml @@ -40,4 +40,4 @@ jobs: - name: Serve site and test with pa11y run: | bundle exec jekyll serve --detach - pa11y-ci http://localhost:4000/ + pa11y-ci --sitemap http://localhost:4000/sitemap.xml diff --git a/Gemfile b/Gemfile index d51c8548..83df932d 100644 --- a/Gemfile +++ b/Gemfile @@ -37,3 +37,6 @@ gem "jekyll-redirect-from" gem "jemoji" gem "webrick", "~> 1.7" + +# Generates a sitemap +gem 'jekyll-sitemap' \ No newline at end of file diff --git a/_config.yml b/_config.yml index 249a8a6a..5af776cf 100644 --- a/_config.yml +++ b/_config.yml @@ -53,6 +53,7 @@ plugins: - jekyll-redirect-from - jekyll-paginate - jemoji + - jekyll-sitemap exclude: - Gemfile - Gemfile.lock diff --git a/_layouts/default.html b/_layouts/default.html index 6fb2ea89..71044f40 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -60,13 +60,9 @@

- - The University of Sheffield - - Research Software Engineering Sheffield + The University of Sheffield Research Software Engineering

@@ -100,7 +96,8 @@

+ style="display:inline-block;" + class="sm-a"> CC BY-SA 4.0

- Designed with by Xiaoying Riley for developers + Designed with by Xiaoying Riley for developers
diff --git a/_sass/theme/_base.scss b/_sass/theme/_base.scss index 60e479f3..591b24c2 100644 --- a/_sass/theme/_base.scss +++ b/_sass/theme/_base.scss @@ -1,15 +1,28 @@ /* ======= Base ======= */ + @font-face { - font-family: 'tuos_stephensonbold'; - src: url('/assets/fonts/stephbd-webfont.woff2') format('woff2'), - url('/assets/fonts/stephbd-webfont.woff') format('woff'); + font-family: uos-sans; + src: url('../fonts/SourceSansPro-Regular.ttf') format("truetype"); font-weight: normal; font-style: normal; + } -} +@font-face { + font-family: uos-serif; + src: url('../fonts/SourceSerifPro-Regular.ttf') format("truetype"); + font-weight: normal; + font-style: normal; + } + +@font-face { + font-family: uos-mono; + src: url('../fonts/SourceCodePro-VariableFont_wght.ttf') format("truetype"); + font-weight: normal; + font-style: monospace; + } body { - font-family: 'Lato', arial, sans-serif; + font-family: 'uos-sans', arial, sans-serif; color: $text-color; font-size: 16px; -webkit-font-smoothing: antialiased; diff --git a/assets/css/custom.css b/assets/css/custom.css index f8c80dee..f5d27802 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -12,12 +12,25 @@ xl @media (min-width:1200px) */ +:root { + --uos-deep-violet: #440099; + --uos-powder-blue: #9ADBE8; + --uos-midnight-black: #131E29; + --uos-teal: #005A8F; + --uos-aqua: #00BBCC; + --uos-mint-green: #00CE7C; + } + +.header{ + background-color: #fff; +} + .promo{ - background: #37618a; + background: var(--uos-midnight-black); } .footer{ - background: #00060c; + background: var(--uos-midnight-black); } /* Sizes for h1 to h6, overriding bootstrap css */ @@ -28,12 +41,29 @@ h4, .h4 { font-size: 1.5rem; } h5, .h5 { font-size: 1.25rem; } h6, .h6 { font-size: 1rem; } +h1, h2, h3, h4, h5, h6 { + color: var(--uos-deep-violet); +} + +a { + color: var(--uos-deep-violet); +} + .nav-link{ - color: #00060d !important; + color: var(--uos-midnight-black) !important; +} + +.contact { + background: var(--uos-midnight-black); } .contact-inner a { - color: #00060d !important; + color: var(--uos-powder-blue); + text-decoration: underline; +} + +.contact-inner h2 { + color: #fff !important; } .seminar-section { @@ -115,7 +145,7 @@ div.all-posts { /* Extra custom styling for pre / code blocks */ pre { - background-color: #282a36; + background-color: var(--uos-midnight-black); padding: 1em; margin: 0 0 1em 0; border-radius: 0.4em; @@ -153,8 +183,33 @@ blockquote { white-space: normal; } +.btn-primary { + background-color: var(--uos-powder-blue); + border-color: var(--uos-powder-blue); + color: var(--uos-midnight-black); +} + +.btn-primary:hover { + background-color: var(--uos-deep-violet); + border-color: var(--uos-deep-violet); + color: var(#fff); +} + +.btn-success { + background-color: var(--uos-mint-green); + border-color: var(--uos-mint-green); + color: var(--uos-midnight-black); +} + +.btn-success:hover { + background-color: var(--uos-deep-violet); + border-color: var(--uos-deep-violet); + color: var(#fff); +} + .sm-a { - color: #b0ea44; + color: var(--uos-powder-blue); + text-decoration: underline; } .sm-a:hover{ diff --git a/assets/fonts/SourceCodePro-VariableFont_wght.ttf b/assets/fonts/SourceCodePro-VariableFont_wght.ttf new file mode 100644 index 00000000..cd96a614 Binary files /dev/null and b/assets/fonts/SourceCodePro-VariableFont_wght.ttf differ diff --git a/assets/fonts/SourceSansPro-Regular.ttf b/assets/fonts/SourceSansPro-Regular.ttf new file mode 100644 index 00000000..98e85797 Binary files /dev/null and b/assets/fonts/SourceSansPro-Regular.ttf differ diff --git a/assets/fonts/SourceSerifPro-Regular.ttf b/assets/fonts/SourceSerifPro-Regular.ttf new file mode 100644 index 00000000..5c593b99 Binary files /dev/null and b/assets/fonts/SourceSerifPro-Regular.ttf differ diff --git a/assets/fonts/StephIt.ttf b/assets/fonts/StephIt.ttf deleted file mode 100644 index 028e9147..00000000 Binary files a/assets/fonts/StephIt.ttf and /dev/null differ diff --git a/assets/fonts/stephbd-webfont.woff b/assets/fonts/stephbd-webfont.woff deleted file mode 100644 index c1928f3f..00000000 Binary files a/assets/fonts/stephbd-webfont.woff and /dev/null differ diff --git a/assets/fonts/stephbd-webfont.woff2 b/assets/fonts/stephbd-webfont.woff2 deleted file mode 100644 index a2f32e5c..00000000 Binary files a/assets/fonts/stephbd-webfont.woff2 and /dev/null differ diff --git a/assets/images/logo/UoS_Violet_RSE.png b/assets/images/logo/UoS_Violet_RSE.png new file mode 100644 index 00000000..7740db4e Binary files /dev/null and b/assets/images/logo/UoS_Violet_RSE.png differ