From fae4cd6e9b90597b76d2d485cc5826cebe44bf3b Mon Sep 17 00:00:00 2001 From: WillFuller <57098934+WillFuller@users.noreply.github.com> Date: Fri, 10 May 2024 19:59:12 +0100 Subject: [PATCH] Update some bits and pieces (#13) # Merged changes from Upstream Fork * Increase font size in code blocks See https://github.com/academicpages/academicpages.github.io/issues/59 * Adds missing semi-colon * fix font awesome code icon in syntax box * Fix encoding issue with bib files * add goodreads to site * change orcid color * add medium icon * add medium profile * Resolve Google Scholar link not displayed There was as slight typo in the logic due to which the google scholar link for the respective author's profile set in Config was not being displayed. * Adding pronouns field to author profile * Add Google Analytics 4 Support * fix: Remove deprecated JavaScript to avoid load error from 404 page * Update files to be ignored * + webrick to gem file * #1902 RM excerpt in pages * Start updating the README * #456 Use real Google Scholar link as an example * Update issue templates * RM minimal mistakes changelog * #1906 * Edit readme * + Syntax highlighting example * Update README.md * Update README * Correct syntax * Streamline config organization for new users * Add Mastodon to social media * Closes #696 with new Kaggle link * Adjustments to Kaggle link * Closes #271 with addition of arXiv * #244, #1600, #1917 update font awesome to v6, add icons * Closes #1911 with update to Academicons * Closes #1671 with a new favicon * #462 update inline documentation * #1041 allow links to wrap * Closes #1773 with update to HTML * Closes #45 with an update to the CV generator * #33, #1919 Possible missing template fix, bump MathJax to 3.0 * #1153 add Zhihu * Closes #1905 with updates to documentation * Closes #693 with updates to documentation and location of citation * Closes #820 with updated style * added missing spanish translations and updated some of the previous ones on ui-text-yml * Replace `polyfill.io` * Closes #1972, update Markdown documentation * Closes #1936 with setting to hide RSS feed * #1935 clean-up the footer follow a bit * RM old development override * Make it clearer where the footnotes are * #1975 ignore files created by npm * Closes #339 with a fixed masthead * #1975 version updates, manage jQuery from npm * Closes #1970 with responsive element * Fix typo * Closes #1999 * scroll in sidebar * scroll in sidebar * Add scroll to sidebar and adjust media query for screen adaptability * Closes #2029 with update to sidebar * Closes #1917 with with icon, FA bump to 6.5.2 * Update _config.yml # Added More Info and blanked out the template filler material. * added to short left hand bio * Commented out most of the example publication * couldn't comment out the link, so changed text from The paper can be downloaded here to test link, and redirected the link to the correct test file * Comment out 2012-03-01-talk-1.md * Commented out 2013-03-01-tutorial-1.md * added some text so that the rest renders blank 2012-03-01-talk-1.md * Commented out 2014-02-01-talk-2.md * Comment out 2014-03-01-talk-3.md * Comment out 2012-08-14-blog-post-1.md * Update 2012-08-14-blog-post-1.md * Comment out Update 2199-01-01-future-post.md * Comment out portfolio-1.md * Comment out portfolio-2.html * Commented out pubs and talks for now navigation.yml * Update cv.md * Update cv.md * rename to about about.md * Update _config.yml * Rename webpage main title * Update cv.md - figured out how to properly comment out the links to stuff - added Scotts email - started to begin summary for each job * Update cv.md * Update cv.md * Create 2021-04-20-iop-poster-optimising.md * Update and rename 2021-04-20-iop-poster-optimising.md to 2021-04-06-iop-poster-optimising.md * added poster file * #2061 Update README with note on dependencies * Closes #2055 with adjustment to masthead-height * Adjust variable name to prevent confusion * Update casing of template name * managed to empty out the CV when stuff isn't there * hidden blogposts for now until I add some more * added some detail to CV * added some more intro details for the about page --------- ## Main Repo Credits Co-authored-by: Steve Co-authored-by: Rob Williams Co-authored-by: sigma67 Co-authored-by: naveenarun Co-authored-by: Mohit_Gupta <52665879+Mohit-15@users.noreply.github.com> Co-authored-by: Bhavish Pahwa <53102161+bp-high@users.noreply.github.com> Co-authored-by: amyzlc <6166519+amyzlc@users.noreply.github.com> Co-authored-by: Sonny Arora Co-authored-by: Bhav Beri <43399374+bhavberi@users.noreply.github.com> Co-authored-by: rjzupkoii Co-authored-by: johnhandleyd Co-authored-by: SukkaW Co-authored-by: Maximiliano --- .github/ISSUE_TEMPLATE/bug_report.md | 38 + .github/ISSUE_TEMPLATE/feature_request.md | 20 + .gitignore | 10 + CHANGELOG.md | 484 -- CONTRIBUTING.md | 9 +- Gemfile | 1 + README.md | 41 +- _config.dev.yml | 13 - _config.yml | 13 +- _data/navigation.yml | 12 +- _data/ui-text.yml | 32 +- .../google-analytics-4.html | 8 + _includes/analytics.html | 2 + _includes/archive-single.html | 4 +- _includes/author-profile.html | 166 +- _includes/footer.html | 10 +- _includes/head/custom.html | 14 +- _layouts/single.html | 17 +- _pages/404.md | 11 +- _pages/about.md | 8 +- _pages/cv.md | 58 +- _pages/markdown.md | 66 +- _pages/non-menu-page.md | 1 - _pages/publications.md | 4 +- _portfolio/portfolio-1.md | 16 +- _portfolio/portfolio-2.html | 12 +- _posters/2021-04-06-iop-poster-optimising.md | 16 + _posts/2012-08-14-blog-post-1.md | 52 +- _posts/2199-01-01-future-post.md | 30 +- .../2009-10-01-paper-title-number-1.md | 41 +- .../2024-02-17-paper-title-number-4.md | 12 + _sass/_base.scss | 2 +- _sass/_masthead.scss | 7 +- _sass/_sidebar.scss | 25 +- _sass/_syntax.scss | 7 +- _sass/_utilities.scss | 33 + _sass/_variables.scss | 12 + _sass/vendor/font-awesome/_animated.scss | 150 +- .../vendor/font-awesome/_bordered-pulled.scss | 26 +- _sass/vendor/font-awesome/_core.scss | 33 +- _sass/vendor/font-awesome/_fixed-width.scss | 3 +- _sass/vendor/font-awesome/_functions.scss | 57 + _sass/vendor/font-awesome/_icons.scss | 1266 +--- _sass/vendor/font-awesome/_larger.scss | 23 - _sass/vendor/font-awesome/_list.scss | 8 +- _sass/vendor/font-awesome/_mixins.scss | 85 +- .../vendor/font-awesome/_rotated-flipped.scss | 42 +- _sass/vendor/font-awesome/_screen-reader.scss | 15 +- _sass/vendor/font-awesome/_shims.scss | 1784 ++--- _sass/vendor/font-awesome/_sizing.scss | 16 + _sass/vendor/font-awesome/_stacked.scss | 9 +- _sass/vendor/font-awesome/_variables.scss | 6165 +++++++++++++---- _sass/vendor/font-awesome/brands.scss | 31 +- _sass/vendor/font-awesome/fontawesome.scss | 9 +- _sass/vendor/font-awesome/regular.scss | 24 +- _sass/vendor/font-awesome/solid.scss | 25 +- _sass/vendor/font-awesome/v4-shims.scss | 7 +- _talks/2012-03-01-talk-1.md | 32 +- _talks/2013-03-01-tutorial-1.md | 34 +- _talks/2014-02-01-talk-2.md | 34 +- _talks/2014-03-01-talk-3.md | 32 +- assets/css/academicons.css | 542 +- assets/css/academicons.min.css | 2 +- assets/css/collapse.css | 1 + assets/fonts/academicons.eot | Bin 38012 -> 68058 bytes assets/fonts/academicons.svg | 1941 +++++- assets/fonts/academicons.ttf | Bin 37832 -> 67872 bytes assets/fonts/academicons.woff | Bin 37908 -> 131616 bytes assets/fonts/fa-brands-400.eot | Bin 126428 -> 0 bytes assets/fonts/fa-brands-400.svg | 1184 ---- assets/fonts/fa-brands-400.ttf | Bin 126192 -> 0 bytes assets/fonts/fa-brands-400.woff | Bin 81612 -> 0 bytes assets/fonts/fa-brands-400.woff2 | Bin 69608 -> 0 bytes assets/fonts/fa-regular-400.eot | Bin 40460 -> 0 bytes assets/fonts/fa-regular-400.svg | 467 -- assets/fonts/fa-regular-400.ttf | Bin 40232 -> 0 bytes assets/fonts/fa-regular-400.woff | Bin 18112 -> 0 bytes assets/fonts/fa-regular-400.woff2 | Bin 14844 -> 0 bytes assets/fonts/fa-solid-900.eot | Bin 197172 -> 0 bytes assets/fonts/fa-solid-900.svg | 2618 ------- assets/fonts/fa-solid-900.ttf | Bin 196952 -> 0 bytes assets/fonts/fa-solid-900.woff | Bin 95436 -> 0 bytes assets/fonts/fa-solid-900.woff2 | Bin 73852 -> 0 bytes assets/js/_main.js | 31 +- assets/js/main.min.js | 6 +- assets/webfonts/fa-brands-400.ttf | Bin 0 -> 209128 bytes assets/webfonts/fa-brands-400.woff2 | Bin 0 -> 117852 bytes assets/webfonts/fa-regular-400.ttf | Bin 0 -> 67860 bytes assets/webfonts/fa-regular-400.woff2 | Bin 0 -> 25392 bytes assets/webfonts/fa-solid-900.ttf | Bin 0 -> 420332 bytes assets/webfonts/fa-solid-900.woff2 | Bin 0 -> 156400 bytes assets/webfonts/fa-v4compatibility.ttf | Bin 0 -> 10832 bytes assets/webfonts/fa-v4compatibility.woff2 | Bin 0 -> 4792 bytes files/2021_iop_poster.pdf | Bin 0 -> 6470061 bytes images/favicon.ico | Bin 0 -> 15086 bytes markdown_generator/PubsFromBib.ipynb | 4 +- markdown_generator/pubsFromBib.py | 2 +- package.json | 27 +- 98 files changed, 8960 insertions(+), 9082 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 CHANGELOG.md delete mode 100644 _config.dev.yml create mode 100644 _includes/analytics-providers/google-analytics-4.html create mode 100644 _posters/2021-04-06-iop-poster-optimising.md create mode 100644 _publications/2024-02-17-paper-title-number-4.md create mode 100644 _sass/vendor/font-awesome/_functions.scss delete mode 100644 _sass/vendor/font-awesome/_larger.scss create mode 100644 _sass/vendor/font-awesome/_sizing.scss delete mode 100644 assets/fonts/fa-brands-400.eot delete mode 100644 assets/fonts/fa-brands-400.svg delete mode 100644 assets/fonts/fa-brands-400.ttf delete mode 100644 assets/fonts/fa-brands-400.woff delete mode 100644 assets/fonts/fa-brands-400.woff2 delete mode 100644 assets/fonts/fa-regular-400.eot delete mode 100644 assets/fonts/fa-regular-400.svg delete mode 100644 assets/fonts/fa-regular-400.ttf delete mode 100644 assets/fonts/fa-regular-400.woff delete mode 100644 assets/fonts/fa-regular-400.woff2 delete mode 100644 assets/fonts/fa-solid-900.eot delete mode 100644 assets/fonts/fa-solid-900.svg delete mode 100644 assets/fonts/fa-solid-900.ttf delete mode 100644 assets/fonts/fa-solid-900.woff delete mode 100644 assets/fonts/fa-solid-900.woff2 create mode 100644 assets/webfonts/fa-brands-400.ttf create mode 100644 assets/webfonts/fa-brands-400.woff2 create mode 100644 assets/webfonts/fa-regular-400.ttf create mode 100644 assets/webfonts/fa-regular-400.woff2 create mode 100644 assets/webfonts/fa-solid-900.ttf create mode 100644 assets/webfonts/fa-solid-900.woff2 create mode 100644 assets/webfonts/fa-v4compatibility.ttf create mode 100644 assets/webfonts/fa-v4compatibility.woff2 create mode 100644 files/2021_iop_poster.pdf create mode 100644 images/favicon.ico diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000000000..dd84ea7824f11 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000000000..bbcbbe7d61558 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.gitignore b/.gitignore index bd5d18888f296..27fe097ffd825 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,12 @@ +# Ignore the contents of the _site directory _site/ +# Ignore the directory for local files during development +local/ + +# Ignore the Gemfile that is generated +Gemfile.lock + +# Ingore files created by npm +node_modules +package-lock.json \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 291bc7364935d..0000000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,484 +0,0 @@ -## [3.4.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.2) - -### Enhancements - -- Improve UX of static comment forms. [#448](https://github.com/mmistakes/minimal-mistakes/issues/448) - -## [3.4.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.1) - -### Enhancements - -- Add `staticman.filename` configuration with UNIX timestamp for sorting data files. example ~> `comment-1470943149`. - -### Bug Fixes - -- Don't add `` to author name if URL is blank. - -## [3.4.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.0) - -### Enhancements - -- Support static-based commenting via [Staticman](https://staticman.net/) for sites hosted with GitHub Pages. [#424](https://github.com/mmistakes/minimal-mistakes/issues/424) - -## [3.3.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.7) - -### Bug Fixes - -- Re-enabled Jekyll plugins in `_config.yml` in case they aren't autoloaded in `Gemfile`. [#417](https://github.com/mmistakes/minimal-mistakes/issues/417) - -### Enhancements - -- Fallback to `site.github.url` for use in `{{ base_path }}` when `site.url` is `nil`. -- Replace Sass and Autoprefixer `npm` build scripts with [Jekyll's built-in asset support](https://jekyllrb.com/docs/assets/). [#333](https://github.com/mmistakes/minimal-mistakes/issues/333) - -### Maintenance - -- Document `site.repository` and its role with [`github-metadata`](https://github.com/jekyll/github-metadata) gem. -- Add sample [archive page with content](https://mmistakes.github.io/minimal-mistakes/archive-layout-with-content/) for testing styles on demo site. - -## [3.3.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.6) - -### Bug Fixes - -- Fix blank `site.teaser` bug. [#412](https://github.com/mmistakes/minimal-mistakes/issues/412) - -## [3.3.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.5) - -### Enhancements - -- Add English default text `site.locale` strings. [#407](https://github.com/mmistakes/minimal-mistakes/issues/407) -- Add Portuguese localized UI text. [#411](https://github.com/mmistakes/minimal-mistakes/pull/411) -- Add Italian localized UI text. [#409](https://github.com/mmistakes/minimal-mistakes/pull/409) - -### Maintenance - -- Remove unused Google AdSense variables in `_config.yml`. [#404](https://github.com/mmistakes/minimal-mistakes/issues/404) -- Update `Gemfile` instructions for using `github-pages` vs. native `jekyll` gems. -- Disable `gems:` in `_config.yml` and enable plugins with Bundler instead. -- Add `repository` to `_config.yml` to suppress GitHub Pages error `Liquid Exception: No repo name found.` - -## [3.3.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.4) - -### Enhancements - -- Add support for configurable feed URL to use a service like FeedBurner instead of linking directly to `feed.xml` in `` and the site footer. [#378](https://github.com/mmistakes/minimal-mistakes/issues/378), [#379](https://github.com/mmistakes/minimal-mistakes/pull/379), [#406](https://github.com/mmistakes/minimal-mistakes/pull/406) -- Add Turkish localized UI text. [#403](https://github.com/mmistakes/minimal-mistakes/pull/403) - -### Maintenance - -- Update gems: `activesupport` (4.2.7), `ffi` (1.9.14), `github-pages` (88), `jekyll-redirect-from` (0.11.0), `jekyll-watch` (1.5.0). - -## [3.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.3) - -### Enhancements - -- Make footer stick to the bottom of the page. - -### Bug Fixes - -- Fix `gallery` size bug [#402](https://github.com/mmistakes/minimal-mistakes/issues/402) - -### Maintenance - -- Set default `lang` to `en`. - -## [3.3.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.2) - -### Bug Fixes - -- Fix JavaScript that triggers "sticky" sidebar to avoid layout issues on screen sizes < `1024px`. [#396](https://github.com/mmistakes/minimal-mistakes/issues/396) - -## [3.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.1) - -### Enhancements - -- Enable image popup on < 500px wide screens. [#385](https://github.com/mmistakes/minimal-mistakes/issues/385) -- Indicate the relationship between component URLs in a paginated series by applying `rel="prev"` and `rel="next"` to pages that use `site.paginator`. [#253](https://github.com/mmistakes/minimal-mistakes/issues/253) -- Improve link posts in archive listings. [#276](https://github.com/mmistakes/minimal-mistakes/issues/276) - -### Maintenance - -- Update gems: `github-pages` (86), `ffi` 1.9.13, `jekyll-mentions` 1.1.3, and `rouge` 1.11.1 -- Fix note about custom sidebar content appearing below author profile. [#388](https://github.com/mmistakes/minimal-mistakes/issues/388) - -## [3.2.13](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.13) - -### Enhancements - -- Add English default UI text for Canada, Great Britain, and Australia. [#377](https://github.com/mmistakes/minimal-mistakes/issues/377) -- Switch default locale from `en-US` to `en`. - -## [3.2.12](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.12) - -### Enhancements - -- Remove window width "magic number" from sticky sidebar check in `main.js` for improved flexibility. [#375](https://github.com/mmistakes/minimal-mistakes/pull/375) - -### Bug Fixes - -- Fix author override conditional where a missing `authors.yml` would show broken sidebar content. Defaults to `site.author`. [#376](https://github.com/mmistakes/minimal-mistakes/pull/376) - -## [3.2.11](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.11) - -### Bug Fixes - -- Fix disappearing author sidebar links [#372](https://github.com/mmistakes/minimal-mistakes/issues/372) - -### Maintenance - -- Update gems: `github-pages` (84), `jekyll-github-metadata` 2.0.2, and `kramdown` 1.11.1 -- Update vendor JavaScript: jQuery 1.12.4, Stickyfill.js 1.1.4 -- Update Font Awesome 4.6.3 - -## [3.2.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.10) - -### Maintenance - -- Add `CONTRIBUTING.md` - -## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9) - -### Enhancements - -- Add support for [header overlay images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#header-overlay) for Open Graph images. [#358](https://github.com/mmistakes/minimal-mistakes/pull/358) - -### Bug Fixes - -- Fix `Person` typo Schema.org type [#358](https://github.com/mmistakes/minimal-mistakes/pull/358) - -### Maintenance - -- Update `github-pages` gem and dependencies. -- Remove `minutes_read` to avoid awkward reading time wording [#356](https://github.com/mmistakes/minimal-mistakes/issues/356) - -## [3.2.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.8) - -### Bug Fixes - -- Remove `cursor: pointer` that appears on white-space surrounding author side list items and links. [#354](https://github.com/mmistakes/minimal-mistakes/pull/354) - -### Maintenance - -- Add contributing information to `README.md`. [#357](https://github.com/mmistakes/minimal-mistakes/issues/357) - -## [3.2.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.7) - -### Enhancements - -- Add French localized UI text. [#346](https://github.com/mmistakes/minimal-mistakes/pull/346) - -### Bug Fixes - -- Fix branch logic for Yandex and Alexa in `seo.html`. [#348](https://github.com/mmistakes/minimal-mistakes/pull/348) - -## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6) - -### Bug Fixes - -- Fix error `Liquid Exception: divided by 0 in _includes/archive-single.html, included in _layouts/single.html` caused by null `words_per_minute` in `_config.yml`. [#345](https://github.com/mmistakes/minimal-mistakes/pull/345) - -## [3.2.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.5) - -### Bug Fixes - -- Fix link color in hero overlay to be white. -- Remove underlines from archive item titles. - -## [3.2.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.4) - -### Enhancements - -- Improve text alignment of masthead, hero overlay, page footer to be flush left and remove awkward white-space gaps. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342) -- Add Spanish localized UI text. [#338](https://github.com/mmistakes/minimal-mistakes/pull/338) - -### Bug Fixes - -- Fix alignment of icons in author sidebar [#341](https://github.com/mmistakes/minimal-mistakes/issues/341) - -### Maintenance - -- Add background color to page footer to set it apart from main content. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342) -- Add terms and privacy policy to theme's demo site. [#343](https://github.com/mmistakes/minimal-mistakes/issues/343) -- Update screenshots found in theme documentation. - -## [3.2.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.3) - -### Enhancements - -- Add [Discourse](https://www.discourse.org/) as a commenting provider. [#335](https://github.com/mmistakes/minimal-mistakes/pull/335) - -## [3.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.2) - -### Enhancements - -- Add support for image captions in Magnific Popup overlays via the [`gallery`](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery) helper. [#334](https://github.com/mmistakes/minimal-mistakes/issues/334) - -## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1) - -### Bug Fixes - -- Remove need for "double tapping" masthead menu links on iOS devices. [#315](https://github.com/mmistakes/minimal-mistakes/issues/315) - -### Maintenance - -- Add `ISSUE_TEMPLATE.md` for improve issue submission process. - -## [3.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.0) - -### Bug Fixes - -- Fix missing category/tag links in post footer due to possible conflict with `site.tags` and `site.categories`. [#329](https://github.com/mmistakes/minimal-mistakes/issues/329#issuecomment-222375568) - -## [3.1.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.8) - -### Bug Fixes - -- Fix `Liquid Exception: undefined method 'gsub' for nil:NilClass in _layouts/single.html` error when `page.title` is null. `

` element is now conditional if `title: ` is not set for a `page` or collection item. [#312](https://github.com/mmistakes/minimal-mistakes/issues/312) - -### Maintenance - -- Remove duplicate `fa-twitter` and `fa-twitter-square` classes from `_utilities.scss`. [#302](https://github.com/mmistakes/minimal-mistakes/issues/302) - -- Document installing additional Jekyll gem dependencies when using `gem "jekyll"` instead of `gem "github-pages"` to avoid any errors on run. [#305](https://github.com/mmistakes/minimal-mistakes/issues/305) - -## [3.1.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.7) - -### Enhancements - -- Add translation key for "Recent Posts" used in home page `index.html`. [#316](https://github.com/mmistakes/minimal-mistakes/pull/316) - -### Maintenance - -- Small fix to avoid underlying the whitespace between icons and related text when hovering. [#303](https://github.com/mmistakes/minimal-mistakes/pull/303) - -## [3.1.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.6) - -### Maintenance - -- Update gem dependencies. Run `bundle` to update `Gemfile.lock`. - -## [3.1.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.5) - -### Maintenance - -- Fix `www` and `https` links in author profile include [#293](https://github.com/mmistakes/minimal-mistakes/pull/293) - -## [3.1.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.4) - -### Enhancements - -- Add overlay_filter param to hero headers [#298](https://github.com/mmistakes/minimal-mistakes/pull/298) - -## [3.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.3) - -### Enhancements - -- Improve `site.locale` documentation [#284](https://github.com/mmistakes/minimal-mistakes/issues/284) -- Remove ProTip note about protocol-less `site.url` as it is an anti-pattern [#288](https://github.com/mmistakes/minimal-mistakes/issues/288) - -### Bug Fixes - -- Fix `og_image` URL in seo.html [#277](https://github.com/mmistakes/minimal-mistakes/issues/277) -- Fix `author_profile` toggle when assigned in a `_layout` [#285](https://github.com/mmistakes/minimal-mistakes/issues/285) -- Fix typo in `build:all` npm script [#283](https://github.com/mmistakes/minimal-mistakes/pull/283) -- Fix URL typo documentation [#287](https://github.com/mmistakes/minimal-mistakes/issues/287) -- SEO author bug. If `twitter.username` is set and `author.twitter` is `nil` bad things happen. [#289](https://github.com/mmistakes/minimal-mistakes/issues/289) - -## [3.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.2) - -### Enhancements - -- Explain how to use `nav_list` helper in [documentation](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list). -- Reduce left/right padding on smaller screens to increase width of main content column. - -### Bug Fixes - -- Fix alignment issues with related posts [#273](https://github.com/mmistakes/minimal-mistakes/issues/273) and "Follow" button in author profile [#274](https://github.com/mmistakes/minimal-mistakes/issues/274). - -## [3.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.1) - -### Bug Fix - -- Fixed reading time bug when `words_per_minute` wasn't set in `_config.yml` [#271](https://github.com/mmistakes/minimal-mistakes/issues/271) - -## [3.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.0) - -### Enhancements - -- Updated [Font Awesome](https://fortawesome.github.io/Font-Awesome/whats-new/) to version 4.6.1 -- Added optional GitHub and Bitbucket links to footer if set on `site.author` in `_config.yml`. - -### Bug Fixes -- Fixed Bitbucket URL typo in author sidebar. - -## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3) - -### Enhancements - -- Rebuilt the entire theme: layouts, includes, stylesheets, scripts, you name it. -- Refreshed the look and feel while staying true to the original design of the theme (author sidebar/main content). -- Replaced grid system with [Susy](http://susy.oddbird.net/). -- Replaced Grunt tasks with `npm` scripts. -- Removed Google Fonts and replaced with system fonts to improve performance (they can be [added back](https://mmistakes.github.io/minimal-mistakes/docs/stylesheets/) if desired) -- Greatly improved [theme documentation](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/). -- Increased the amount of sample posts, sample pages, and sample collections to throughly test the theme and edge-cases. -- Moved all sample content and assets out of `master` to keep it as clean as possible for forking. -- Added new layouts for `splash` pages, archives for [`jekyll-archives`](https://github.com/jekyll/jekyll-archives) if enabled, and [`compress.html`](https://github.com/penibelst/jekyll-compress-html) to improve performance. -- Added taxonomy links to posts (tags and categories). -- Added optional "reading time" meta data. -- Improved Liquid used for Twitter Cards and Open Graph data in ``. -- Improved `gallery` include helper and added `feature_row` for use with splash page layout. -- Added Keybase.io, author web URI, and Bitbucket optional links to sidebar. -- Add `feed.xml` link to footer. -- Added a [UI text data file](https://mmistakes.github.io/minimal-mistakes/docs/ui-text/) to easily change all text found in the theme. -- Added LinkedIn to optional social share buttons. -- Added Facebook, Google+, and custom commenting options in addition to Disqus. -- Added optional breadcrumb links. - -## [2.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.2.1) - -## [2.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.2.0) - -### Enhancements - -- Add support for Jekyll 3.0 -- Minor updates to syntax highlighting CSS and theme documentation - -## [2.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.3) - -### Enhancements - -- Cleaner print styles that remove the top navigation, social sharing buttons, and other elements not needed when printed. - -## [2.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.2) - -### Enhancements - -- Add optional CodePen icon/url to author side bar [#156](https://github.com/mmistakes/minimal-mistakes/pull/156) -- Documented Stackoverflow username explanation in `_config.yml` [#157](https://github.com/mmistakes/minimal-mistakes/pull/157) -- Simplified Liquid in `post-index.html` to better handle year listings [#166](https://github.com/mmistakes/minimal-mistakes/pull/166) - -### Bug Fixes - -- Cleanup Facebook related Open Graph meta tags [#149](https://github.com/mmistakes/minimal-mistakes/issues/149) -- Corrected minor typos [#158](https://github.com/mmistakes/minimal-mistakes/pull/158) [#175](https://github.com/mmistakes/minimal-mistakes/issues/175) - -## [2.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.1) - -### Enhancements - -- Add optional XING profile link to author sidebar -- Include open graph meta tags for feature image (if assigned) [#149](https://github.com/mmistakes/minimal-mistakes/issues/149) -- Create an include for feed footer - -### Bug Fixes - -- Remove http protocol from Google search form on sample 404 page -- Only show related posts if there are one or more available -- Fix alignment of email address link in author sidebar - -## [2.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.0) - -### Enhancements - -- Add optional social sharing buttons ([#42](https://github.com/mmistakes/minimal-mistakes/issues/42)) - -![social sharing buttons](https://cloud.githubusercontent.com/assets/1376749/5860522/d9f28a96-a22f-11e4-9b83-940a3a9a766a.png) - -- Add Soundcloud, YouTube ([#95](https://github.com/mmistakes/minimal-mistakes/pull/95)), Flickr ([#119](https://github.com/mmistakes/minimal-mistakes/pull/119)), and Weibo ([#116](https://github.com/mmistakes/minimal-mistakes/pull/116)) icons for use in author sidebar. -- Fix typos in posts and documentation and remove references to Less -- Include note about Octopress gem being optional -- Post author override support extended to the Atom feed ([#71](https://github.com/mmistakes/minimal-mistakes/pull/71)) -- Only include email address in feed if specified in `_config.yml` or author `_data` -- Wrap all page content in `#main` to harmonize article and post index styles ([#86](https://github.com/mmistakes/minimal-mistakes/issues/86)) -- Include new sample feature images for posts and pages -- Table of contents improvements: fix collapse toggle, indent nested elements, show on small screens, and create an `_include` for reusing in posts and pages. -- Include note about running Jekyll with `bundle exec` when using Bundler -- Fix home page path in top navigation -- Remove Google Authorship ([#120](https://github.com/mmistakes/minimal-mistakes/issues/120)) -- Remove duplicate author content that displayed in `div.article-author-bottom` -- Removed unused `_sass/print.scss` styles -- Improve comments in `.scss` files - -## [2.0.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/v2.0) - -## [1.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.3.3) - -### Enhancements - -- Added new icons and profile links for Stackoverflow, Dribbble, Pinterest, Foursquare, and Steam to the author bio sidebar. -- Cleaned up the Kramdown auto table of contents styling to be more readable -- Removed page width specific .less stylesheets and created mixins for easier updating -- Removed Modernizr since it wasn't being used -- Added pages to sitemap.xml -- Added category: to rake new_post task -- Minor typographic changes - -### Bug Fixes - -- Corrected various broken links in README and Theme Setup. - -## [1.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.3.1) - -### Enhancements - -- Cleaned up table of contents styling -- Reworked top navigation to be a better experience on small screens. Nav items now display vertically when the menu button is tapped, revealing links with larger touch targets. - -![menu animation](https://camo.githubusercontent.com/3fbd8c1326485f4b1ab32c0005c0fca7660b5d31/68747470733a2f2f662e636c6f75642e6769746875622e636f6d2f6173736574732f313337363734392f323136343037352f31653366303663322d393465372d313165332d383961612d6436623636376562306564662e676966) - -## [1.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.2.0) - -### Bug Fixes - -- Table weren't filling the entire width of the content container. They now scale at 100%. Thanks [@dhruvbhatia](https://github.com/dhruvbhatia) - -### Enhancements - -- Decreased spacing between Markdown footnotes -- Removed dark background on footer -- Removed UPPERCASE styling on post titles in the index listing - -## [1.1.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.1.4) - -### Bug Fixes - -- Fix top navigation bug issue ([#10](https://github.com/mmistakes/minimal-mistakes/issues/10)) for real this time. Remember to clear your floats kids. - -## [1.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.1.3) - -### Bug Fixes - -- Fix top navigation links that weren't click able on small viewports (Issue [#10](https://github.com/mmistakes/minimal-mistakes/issues/10)). -- Remove line wrap from top navigation links that may span multiple lines. - -## [1.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.1.2) - -### Enhancements - -- Added Grunt build script for compiling Less/JavaScript and optimizing image assets. -- Added support for large image summary Twitter card. -- Stylesheet adjustments - -## [1.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.1.1) - -### Bug Fixes - -- Removed [Typeplate](http://typeplate.com/) styles. Was [causing issues with newer versions of Less](https://github.com/typeplate/typeplate.github.io/issues/108) and is no longer maintained. - -### Enhancements - -- Added [image attribution](http://mmistakes.github.io/minimal-mistakes/theme-setup/#feature-images) for post and page feature images. -- Added [404 page](http://mmistakes.github.io/minimal-mistakes/404.html). -- Cleaned up various Less variables to better align with naming conventions used in other MM Jekyll themes. -- Removed Chrome Frame references. -- Added global CSS3 transitions to text and block elements. -- Improved typography in a few places. - -## [1.0.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/v1.0.2) - -### Enhancements - -- Google Analytics, Google Authorship, webmaster verifies, and Twitter card meta are now optional. - -## [1.0.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/v1.0.1) \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 803b63d857150..23c50b425a857 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,8 @@ -Contributions are welcome! Please add issues and make pull requests. There are no stupid questions. All ideas are welcome. This is a volunteer project. Be excellent to each other. +Contributions are welcome! -Fork from master and go from there. This repository is intended to remain a generic, ready-to-fork template that demonstrates the features of academicpages. +Please add issues and make pull requests. There are no stupid questions. All ideas are welcome. This is a volunteer project. Be excellent to each other. + +Bug reports and feature requests to the template should be [submitted via GitHub](https://github.com/academicpages/academicpages.github.io/issues/new/choose). For questions concerning how to style the template, please feel free to start a [new discussion on GitHub](https://github.com/academicpages/academicpages.github.io/discussions). + +Fork from master and go from there. Remember that this repository is intended to remain a generic, ready-to-fork template that demonstrates the features of academicpages. -If you make a pull request and change code, please make sure there is a closed issue tagged with 'code change' that has some comment linking to either the single commit (if the change was just one commit) or a diff comparing before/after the change (see [issue 21](https://github.com/academicpages/academicpages.github.io/issues/21) for example). This is so that those who have forked this repo and modified it for their purposes can more easily patch bugs and new features. diff --git a/Gemfile b/Gemfile index 1629566cf4197..a8b872e79df4c 100644 --- a/Gemfile +++ b/Gemfile @@ -24,4 +24,5 @@ group :jekyll_plugins do gem "jekyll-feed" gem 'jekyll-sitemap' gem 'hawkins' + gem "webrick", "~> 1.8" end diff --git a/README.md b/README.md index 7736cd10d0713..98659b555d37c 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,42 @@ -A Github Pages template for academic websites. This was forked (then detached) by [Stuart Geiger](https://github.com/staeiou) from the [Minimal Mistakes Jekyll Theme](https://mmistakes.github.io/minimal-mistakes/), which is © 2016 Michael Rose and released under the MIT License. See LICENSE.md. -I think I've got things running smoothly and fixed some major bugs, but feel free to file issues or make pull requests if you want to improve the generic template / theme. +# Academic Pages -### Note: if you are using this repo and now get a notification about a security vulnerability, delete the Gemfile.lock file. +![pages-build-deployment](https://github.com/academicpages/academicpages.github.io/actions/workflows/pages/pages-build-deployment/badge.svg) -# Instructions +Academic Pages is a Github Pages template for academic websites. + + +# Getting Started 1. Register a GitHub account if you don't have one and confirm your e-mail (required!) -1. Fork [this repository](https://github.com/academicpages/academicpages.github.io) by clicking the "fork" button in the top right. -1. Go to the repository's settings (rightmost item in the tabs that start with "Code", should be below "Unwatch"). Rename the repository "[your GitHub username].github.io", which will also be your website's URL. -1. Set site-wide configuration and create content & metadata (see below -- also see [this set of diffs](http://archive.is/3TPas) showing what files were changed to set up [an example site](https://getorg-testacct.github.io) for a user with the username "getorg-testacct") -1. Upload any files (like PDFs, .zip files, etc.) to the files/ directory. They will appear at https://[your GitHub username].github.io/files/example.pdf. +1. Click the "Use this template" button in the top right. +1. On the "New repository" page, enter your repository name as "[your GitHub username].github.io", which will also be your website's URL. +1. Set site-wide configuration and add your content. +1. Upload any files (like PDFs, .zip files, etc.) to the `files/` directory. They will appear at https://[your GitHub username].github.io/files/example.pdf. 1. Check status by going to the repository settings, in the "GitHub pages" section 1. (Optional) Use the Jupyter notebooks or python scripts in the `markdown_generator` folder to generate markdown files for publications and talks from a TSV file. See more info at https://academicpages.github.io/ -## To run locally (not on GitHub Pages, to serve on your own computer) +## Running Locally -1. Clone the repository and made updates as detailed above +When you are initially working your website, it is very useful to be able to preview the changes locally before pushing them to GitHub. To work locally you will need to: + +1. Clone the repository and made updates as detailed above. 1. Make sure you have ruby-dev, bundler, and nodejs installed: `sudo apt install ruby-dev ruby-bundler nodejs` -1. Run `bundle clean` to clean up the directory (no need to run `--force`) 1. Run `bundle install` to install ruby dependencies. If you get errors, delete Gemfile.lock and try again. -1. Run `bundle exec jekyll liveserve` to generate the HTML and serve it from `localhost:4000` the local server will automatically rebuild and refresh the pages on change. +1. Run `jekyll serve -l -H localhost` to generate the HTML and serve it from `localhost:4000` the local server will automatically rebuild and refresh the pages on change. + +If you are running on Linux it may be necessary to install some additional dependencies prior to being able to run locally: `sudo apt install build-essentials gcc make` + +# Maintenance + +Bug reports and feature requests to the template should be [submitted via GitHub](https://github.com/academicpages/academicpages.github.io/issues/new/choose). For questions concerning how to style the template, please feel free to start a [new discussion on GitHub](https://github.com/academicpages/academicpages.github.io/discussions). + +This repository was forked (then detached) by [Stuart Geiger](https://github.com/staeiou) from the [Minimal Mistakes Jekyll Theme](https://mmistakes.github.io/minimal-mistakes/), which is © 2016 Michael Rose and released under the MIT License (see LICENSE.md). It is currently being maintained by [Robert Zupko](https://github.com/rjzupkoii) and additional maintainers would be welcomed. -# Changelog -- bugfixes and enhancements +## Bugfixes and enhancements -There is one logistical issue with a ready-to-fork template theme like academic pages that makes it a little tricky to get bug fixes and updates to the core theme. If you fork this repository, customize it, then pull again, you'll probably get merge conflicts. If you want to save your various .yml configuration files and markdown files, you can delete the repository and fork it again. Or you can manually patch. +If you have bugfixes and enhancements that you would like to submit as a pull request, you will need to [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) this repository as opposed to using it as a template. This will also allow you to [synchronize your copy](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) of template to your fork as well. -To support this, all changes to the underlying code appear as a closed issue with the tag 'code change' -- get the list [here](https://github.com/academicpages/academicpages.github.io/issues?q=is%3Aclosed%20is%3Aissue%20label%3A%22code%20change%22%20). Each issue thread includes a comment linking to the single commit or a diff across multiple commits, so those with forked repositories can easily identify what they need to patch. +Unfortunately, one logistical issue with a template theme like Academic Pages that makes it a little tricky to get bug fixes and updates to the core theme. If you use this template and customize it, you will probably get merge conflicts if you attempt to synchronize. If you want to save your various .yml configuration files and markdown files, you can delete the repository and fork it again. Or you can manually patch. diff --git a/_config.dev.yml b/_config.dev.yml deleted file mode 100644 index 45df3dfe29a0c..0000000000000 --- a/_config.dev.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Develop override settings - -url: http://localhost:4000 - -analytics: - provider: false - -comments: - disqus: - shortname : "mmistakes-dev" - -sass: - style: expanded \ No newline at end of file diff --git a/_config.yml b/_config.yml index 854a6fd81f069..ff24316d452e6 100644 --- a/_config.yml +++ b/_config.yml @@ -3,11 +3,12 @@ # This config file is meant for settings that affect your entire site, values # which you are expected to set up once and rarely need to edit after that. # For technical reasons, this file is *NOT* reloaded automatically when you use -# `jekyll serve`. If you change this file, please restart the server process. +# `jekyll serve -l -H localhost`. If you change this file, please restart the +# server process. # Site Settings locale : "en-GB" -title : "William Fuller / Academic Webpage" +title : "William Fuller" title_separator : "-" name : &name "William Fuller" description : &description "personal description" @@ -47,14 +48,17 @@ staticman: options: format : "iso8601" # "iso8601" (default), "timestamp-seconds", "timestamp-milliseconds" atom_feed: + hide : false # change to true to hide the RSS feed in the footer path : # blank (default) uses feed.xml + # SEO Related google_site_verification : bing_site_verification : alexa_site_verification : yandex_site_verification : + # Social Sharing twitter: username : &twitter "fusionwill" @@ -73,7 +77,7 @@ social: # Analytics analytics: - provider : "google-universal" # false (default), "google", "google-universal", "custom" + provider : "google-universal" # false (default), "google", "google-universal", "google-analytics-4", "custom" google: tracking_id : @@ -82,7 +86,7 @@ analytics: author: name : "Will Fuller" avatar : "profile.jpg" - bio : "Your biography for the left-hand sidebar" + bio : "Experimentalist, Engineer, and Adventurer" location : "Oxford, UK" employer : pubmed : # "https://www.ncbi.nlm.nih.gov/pubmed/?term=john+snow" @@ -257,6 +261,7 @@ defaults: author_profile: true share: true + # Sass/SCSS sass: sass_dir: _sass diff --git a/_data/navigation.yml b/_data/navigation.yml index 630a8882554d2..a518536b4c493 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -6,14 +6,14 @@ main: - title: "Teaching" url: /teaching/ - - title: "Publications" - url: /publications/ + #- title: "Publications" + #url: /publications/ - - title: "Talks" - url: /talks/ + #- title: "Talks" + #url: /talks/ - title: "CV" url: /cv/ - - title: "Blog Posts" - url: /year-archive/ + #- title: "Blog Posts" + #url: /year-archive/ diff --git a/_data/ui-text.yml b/_data/ui-text.yml index f37f7fa77217d..d5c4a22af0dda 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -66,27 +66,27 @@ es: &DEFAULT_ES categories_label : "Categorías:" date_label : "Actualizado:" comments_label : "Comentar" - comments_title : + comments_title : "Deja un comentario" more_label : "Ver más" - related_label : "Podrías ver también" + related_label : "Quizás te interese" follow_label : "Seguir:" feed_label : "Feed" - powered_by : "Powered by" + powered_by : "Creado por" website_label : "Sitio web" - email_label : "Email" + email_label : "Correo" recent_posts : "Entradas recientes" - undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml" - comment_form_info : - comment_form_comment_label : - comment_form_md_info : - comment_form_name_label : - comment_form_email_label : - comment_form_website_label : - comment_btn_submit : - comment_btn_submitted : - comment_success_msg : - comment_error_msg : - loading_label : + undefined_wpm : "Parámetro words_per_minute (palabras por minuto) no definido en _config.yml" + comment_form_info : "No se publicará tu correo electrónico. Véanse marcados los campos obligatorios" + comment_form_comment_label : "Comentario" + comment_form_md_info : "Markdown es compatible" + comment_form_name_label : "Nombre" + comment_form_email_label : "Correo electrónico" + comment_form_website_label : "Página web (opcional)" + comment_btn_submit : "Enviar comentario" + comment_btn_submitted : "Enviado" + comment_success_msg : "¡Gracias por tu comentario! Aparecerá en la página cuando sea aprobado." + comment_error_msg : "Lo sentimos, ha habido un error con tu solicitud. Por favor, asegúrate de rellenar todos los campos obligatorios e inténtalo de nuevo." + loading_label : "Cargando..." es-ES: <<: *DEFAULT_ES es-CO: diff --git a/_includes/analytics-providers/google-analytics-4.html b/_includes/analytics-providers/google-analytics-4.html new file mode 100644 index 0000000000000..c1ed70c323896 --- /dev/null +++ b/_includes/analytics-providers/google-analytics-4.html @@ -0,0 +1,8 @@ + + diff --git a/_includes/analytics.html b/_includes/analytics.html index 64a3359aad4e4..8f3dda96622ce 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -5,6 +5,8 @@ {% include /analytics-providers/google.html %} {% when "google-universal" %} {% include /analytics-providers/google-universal.html %} +{% when "google-analytics-4" %} + {% include /analytics-providers/google-analytics-4.html %} {% when "custom" %} {% include /analytics-providers/custom.html %} {% endcase %} diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 25784719eb271..b882b3cd707cb 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -53,11 +53,11 @@

{% endif %} {% if post.citation and post.paperurl %} -

Recommended citation: {{ post.citation }} {{ post.paperurl }}

+

Recommended citation: {{ post.citation }} {{ post.paperurl }}

{% elsif post.citation %}

Recommended citation: {{ post.citation }}

{% elsif post.paperurl %} -

Download here

+

Download here

{% endif %} diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 55449165574f6..b0155ccc2a64d 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -16,108 +16,140 @@

{{ author.name }}

+ {% if author.pronouns %}

{{ author.pronouns }}

{% endif %} {% if author.bio %}

{{ author.bio }}

{% endif %}
diff --git a/_includes/footer.html b/_includes/footer.html index 224d9b8908d8d..35dc95c3bd8bf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,24 +1,22 @@ {% include base_path %} +{% if site.author.github or site.author.bitbucket or site.atom_feed.hide != true %}
+{% endif %}
© {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by | default: "Powered by" }} Jekyll & AcademicPages, a fork of Minimal Mistakes.
diff --git a/_includes/head/custom.html b/_includes/head/custom.html index 2a0b1c21e0047..1a0120ebb406b 100644 --- a/_includes/head/custom.html +++ b/_includes/head/custom.html @@ -24,15 +24,9 @@ - - - + + + + diff --git a/_layouts/single.html b/_layouts/single.html index 6290cd24e6063..16ae18ae82113 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -40,20 +40,19 @@

Published in {{ page.venue }}, {{ page.date | default: "1900-01-01" | date: "%Y" }}

{% elsif page.date %}

{{ site.data.ui-text[site.locale].date_label | default: "Published:" }}

- {% endif %} - - - {% if page.citation and page.paperurl %} -

Recommended citation: {{ page.citation }} {{ page.paperurl }}

- {% elsif page.citation %} -

Recommended citation: {{ page.citation }}

- {% endif %} - + {% endif %} {% endunless %}
{{ content }} + + {% if page.citation and page.paperurl %} +

Recommended citation: {{ page.citation }} {{ page.paperurl }}

+ {% elsif page.citation %} +

Recommended citation: {{ page.citation }}

+ {% endif %} + {% if page.link %}{% endif %}
diff --git a/_pages/404.md b/_pages/404.md index 9d0f860661232..a2c7b222b82f7 100644 --- a/_pages/404.md +++ b/_pages/404.md @@ -1,16 +1,7 @@ --- title: "Page Not Found" -excerpt: "Page not found. Your pixels are in another canvas." sitemap: false permalink: /404.html --- -Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below. - - - +Sorry, but the page you were trying to view does not exist. diff --git a/_pages/about.md b/_pages/about.md index 23126f0931deb..b3f96c2533d97 100644 --- a/_pages/about.md +++ b/_pages/about.md @@ -1,6 +1,6 @@ --- permalink: / -title: "William Fuller Academic Webpage" +title: "William Fuller - About Me" excerpt: "About me" author_profile: true redirect_from: @@ -8,7 +8,11 @@ redirect_from: - /about.html --- -I am currently finishing off my PhD with the University of Warwick but I'm based at UKAEA's Culham campus working on the MAST-U spherical tokamak. At UKAEA I am currently the assistant Responsible Officer (RO) for the midplane reciprocating probe, which means I get to get hands-on with a tempermental pnumatic driven reciprocation system with changeble heads! This makes operation more complex and chaotic, especially when a new probe head is swapped out. I do my best to understand the system and organise the rat's nest of cables as best I can though! +I am currently finishing off my PhD with the University of Warwick but I'm based at UKAEA's Culham campus working on the MAST-U spherical tokamak. At UKAEA I am the assistant Responsible Officer (RO) for the midplane reciprocating probe (RP), which means I get to get hands-on with a tempermental pnumatic driven reciprocation system with changeble heads! This makes operation more complex and chaotic, especially when a new probe head is swapped out. I do my best to understand the system and organise the rat's nest of cables as best I can though! + +My PhD project is centered around designing a new probe head for the RP system on MAST-U, targeting turbulent measurements in the scrape-off layer (SOL). I designed a probe head named the "Turbulence Probe Head". It has 15 different Langmuir Probes arranged in several multi-functional arrays to capture as much information from the plasma as possible. + +I am a former cryogenic test engineer, where I wired, tested, and installed custom cryogenic systems across the globe. These systems were used mostly for materials research and quantum computing. I worked mostly on dry cryostats, where a small amount of Helium gas was liquified and cooled copper stages via conduction in a closed loop. But I also occasionally worked on wet cryostats which use large amounts of liquid Helium, such as dilution fridges, capable of < 5mK temperatures! ### Source ------ diff --git a/_pages/cv.md b/_pages/cv.md index a16c0a0dba043..7f95f01a84022 100644 --- a/_pages/cv.md +++ b/_pages/cv.md @@ -11,20 +11,11 @@ redirect_from: Education ====== +* PhD in Fusion Plasma Physics, The University of Warwick, 2024 (expected) * MPhys (Hons) in Physics, The University of Hull, 2016, 2:1 -* Ph.D in Fusion Plasma Physics, The University of Warwick, 2024 (expected) Work experience ====== -* October 2017 - September 2019: Test and Installation Engineer - * [ICEoxford](https://www.iceoxford.com/) - * Duties included: - * cryogenic wiring - * testing of wet and dry cryogenic systems - * diagnosing, and installing systems internationally - * 3-point calibration for temperature sensors used in medical MRI scanners - * Supervisor: Gareth Way - * Manager: Paul Kelly * November 2022 - December 2023: assistant RO for the midplane reciprocating system * UKAEA * Duties included: @@ -32,11 +23,28 @@ Work experience * Perform maintanence as required * Analyse data generated from the diagnostic * Swap out probe heads as required by the campaign - + * Supervisor: [Scott Allan](mailto:Scott.Allan@ukaea.uk) + + +* October 2017 - September 2019: Test and Installation Engineer + * [ICEoxford Ltd.](https://www.iceoxford.com/) + * Duties included: + * Testing of wet and dry cryogenic systems + * Testing and training superconducting magnets + * Diagnosing, and installing systems internationally + * Training users, providing remote support + * Cryogenic wiring + * 3-point calibration for temperature sensors used in medical MRI scanners + * Supervisor: Gareth Way + * Manager: Paul Kelly + + Skills ====== * Communication - * writing academic papers which are consistently highly marked + * writing academic reports which are consistently highly marked * Effective presentations both academic and society based * Contact with customers on installations, training customers on operation and maintenance of a cryostat * Cross communication with other departments, managers, and subject matter experts @@ -50,7 +58,7 @@ Skills * Bash * Git * LaTeX - * Python + * Python3 * Microsoft Office * Familiar with a range of software packages and programming languages: * C @@ -60,29 +68,37 @@ Skills * Origin Pro [Publications]: # + [======]: # - [
    {% for post in site.publications %}]: # - [{% include archive-single-cv.html %}]: # - [{% endfor %}
]: # + +
    {% for post in site.publications reversed %} + {% include archive-single-cv.html %} + {% endfor %}
[Talks]: # + [======]: # - [
    {% for post in site.talks %}]: # - [{% include archive-single-talk-cv.html %}]: # - [{% endfor %}
]: # + +
    {% for post in site.talks reversed %} + {% include archive-single-talk-cv.html %} + {% endfor %}
+ Posters ====== -