Skip to content
Merged
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
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,18 @@ bundle exec jekyll serve
It should now be served on [http://127.0.0.1:4000](http://127.0.0.1:4000)

Go ahead and edit/add what you need! To see the rendered version, refresh the page.

## Styling

The site's CSS is compiled by Jekyll from the Sass sources in `_sass/`, with
`assets/css/main.scss` as the entry point. Editing a file under `_sass/` is all
that is needed — `assets/css/main.css` is regenerated on every build and is what
`_includes/_head.html` loads.

There is no manual regeneration step. The site previously shipped a committed,
hand-optimised `assets/css/main_pretty.css`; nothing in the repo regenerated it,
so it had drifted from the Sass sources and some styles never reached the site.
It has been removed — do not reintroduce a committed CSS artifact.

Source maps are disabled for the build (`sourcemap: never` in `_config.yml`). Set
it to `always` temporarily if you need to trace a rule back to its partial.
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ markdown: kramdown
sass:
sass_dir: _sass
style: compressed
sourcemap: never
plugins:
- jekyll-feed
# - jekyll-sitemap
Expand Down
2 changes: 1 addition & 1 deletion _includes/_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- For all browsers -->
<link rel="stylesheet" href="{{ site.url }}/assets/css/main_pretty.css">
<link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">

<meta http-equiv="cleartype" content="on">

Expand Down
18 changes: 16 additions & 2 deletions _sass/elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ img.grayscale {
border-bottom: 0px !important;
}

// Keep prompt links legible inside article body text.
// Ported from main_pretty.css, where this rule existed only as a direct edit
// to the generated file and was absent from the SCSS sources.
.article-wrap {
p > a.prompt,
li > a.prompt {
color: $white;
}
}

.prompt-attention {
background-color: $attention;
color: $white;
Expand Down Expand Up @@ -204,7 +214,9 @@ img.grayscale {
// Status indicators
// Bastard buttons with no hover actions
// Do not changing cursor to avoid tricking people
.btn-postdoc {
// Visiting postdocs share the postdoc badge colour.
.btn-postdoc,
.btn-visiting-postdoc {
background-color: $info;
color: $white;
border-color: $info;
Expand All @@ -213,7 +225,9 @@ img.grayscale {
cursor: default;
}
}
.btn-phd {
// Visiting PhD candidates share the PhD badge colour.
.btn-phd,
.btn-visiting-phd {
background-color: $warning;
color: $white;
border-color: $warning;
Expand Down
4 changes: 0 additions & 4 deletions assets/css/main_pretty.css

This file was deleted.

Loading