Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pa11y sitemap #3

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pa11y.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ gem "jekyll-redirect-from"
gem "jemoji"

gem "webrick", "~> 1.7"

# Generates a sitemap
gem 'jekyll-sitemap'
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ plugins:
- jekyll-redirect-from
- jekyll-paginate
- jemoji
- jekyll-sitemap
exclude:
- Gemfile
- Gemfile.lock
Expand Down
13 changes: 5 additions & 8 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,9 @@
<div class="container">
<h1 class="logo float-left">
<span class="logo-title">
<a href="https://www.sheffield.ac.uk">
<img src="/assets/images/logo/TUOS_PRIMARY_LOGO_FULL_COLOUR.png" width="110"
alt="The University of Sheffield" />
</a>
<a href="/">
<img src="/assets/images/logo/rse-logoonly-stroke-small.png" width="45"
alt="Research Software Engineering Sheffield" />
<img src="/assets/images/logo/UoS_Violet_RSE.png" width="250"
alt="The University of Sheffield Research Software Engineering" />
</a>
</span>
</h1><!--//logo-->
Expand Down Expand Up @@ -100,7 +96,8 @@ <h1 class="logo float-left">
<a href="http://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1"
target="_blank"
rel="license noopener noreferrer"
style="display:inline-block;">
style="display:inline-block;"
class="sm-a">
CC BY-SA 4.0
<img
style="height:22px!important;margin-left:3px;vertical-align:text-bottom;"
Expand All @@ -114,7 +111,7 @@ <h1 class="logo float-left">
</div><!--//container-->
<div class="container text-center">
<!--/* This template is released under the Creative Commons Attribution 3.0 License. Please keep the attribution link below when using for your own project. Thank you for your support. :) If you'd like to use the template without the attribution, you can buy the commercial license via our website: themes.3rdwavemedia.com */-->
<small class="copyright">Designed with <i class="fas fa-heart"></i> by <a href="https://themes.3rdwavemedia.com" target="_blank">Xiaoying Riley</a> for developers</small>
<small class="copyright">Designed with <i class="fas fa-heart"></i> by <a href="https://themes.3rdwavemedia.com" target="_blank" class="sm-a">Xiaoying Riley</a> for developers</small>
</div><!--//container-->
</footer><!--//footer-->

Expand Down
23 changes: 18 additions & 5 deletions _sass/theme/_base.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
67 changes: 61 additions & 6 deletions assets/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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{
Expand Down
Binary file added assets/fonts/SourceCodePro-VariableFont_wght.ttf
Binary file not shown.
Binary file added assets/fonts/SourceSansPro-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/SourceSerifPro-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/StephIt.ttf
Binary file not shown.
Binary file removed assets/fonts/stephbd-webfont.woff
Binary file not shown.
Binary file removed assets/fonts/stephbd-webfont.woff2
Binary file not shown.
Binary file added assets/images/logo/UoS_Violet_RSE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.