From 0cfc44ddb5962f2270be5f8cb6e7c0f01f515f5e Mon Sep 17 00:00:00 2001
From: Jennifer Mankoff <jmankoff@cs.washington.edu>
Date: Wed, 2 Sep 2020 14:29:06 -0700
Subject: [PATCH] Fixed website to work with Jekyll less than 4.0 and ruby 2.6
---
Gemfile | 7 +-
README.md | 2 +-
_config.yml | 3 +
_posts/2018-07-26-welcome-to-jekyll.markdown | 25 ---
_scss/fontawesome.scss | 16 --
assets/css/my-remark.scss | 3 +-
assets/css/site.scss | 3 +-
assets/css/style.css | 175 -------------------
8 files changed, 11 insertions(+), 223 deletions(-)
delete mode 100644 _posts/2018-07-26-welcome-to-jekyll.markdown
delete mode 100644 _scss/fontawesome.scss
delete mode 100644 assets/css/style.css
diff --git a/Gemfile b/Gemfile
index 7ae6cb7c..1e2d8910 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ source "https://rubygems.org"
# Happy Jekylling!
-gem "jekyll", "3.7.4"
+gem "jekyll", "< 4.0"
# If you have any plugins, put them here!
group :jekyll_plugins do
@@ -20,15 +20,16 @@ group :jekyll_plugins do
gem "jekyll-feed"
gem "jekyll-paginate"
gem "jekyll-contentblocks"
- gem "jekyll-assets", "2.4.0"
+ gem "jekyll-assets"
gem 'jekyll-font-awesome-sass'
+ gem "sprockets", "~> 3.7"
+ gem "kramdown-parser-gfm"
gem 'remark'
gem 'jekyll-mermaid'
gem 'uglifier'
gem 'therubyracer'
end
-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/README.md b/README.md
index 33b66de4..aa0e727d 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,6 @@ To use this website, the following steps are necessary:
# Basic use:
-rvm use ruby 2.4
+rvm use ruby 2.6
bundle exec jekyll build
bundle exec jekyll serve &
diff --git a/_config.yml b/_config.yml
index 0801788b..ab0a495e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -38,6 +38,9 @@ reveal_theme: black.css
markdown: kramdown
theme: jekyll-theme-cayman
+gems:
+ - jekyll-font-awesome-sass
+
plugins:
- jekyll-feed
- jekyll-seo-tag
diff --git a/_posts/2018-07-26-welcome-to-jekyll.markdown b/_posts/2018-07-26-welcome-to-jekyll.markdown
deleted file mode 100644
index 0eb7ee6c..00000000
--- a/_posts/2018-07-26-welcome-to-jekyll.markdown
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: post
-title: "Welcome to Jekyll!"
-date: 2018-07-26 23:02:57 -0700
-categories: jekyll update
----
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
-
-To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-
-Jekyll also offers powerful support for code snippets:
-
-{% highlight ruby %}
-def print_hi(name)
- puts "Hi, #{name}"
-end
-print_hi('Tom')
-#=> prints 'Hi, Tom' to STDOUT.
-{% endhighlight %}
-
-Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
-
-[jekyll-docs]: https://jekyllrb.com/docs/home
-[jekyll-gh]: https://github.com/jekyll/jekyll
-[jekyll-talk]: https://talk.jekyllrb.com/
diff --git a/_scss/fontawesome.scss b/_scss/fontawesome.scss
deleted file mode 100644
index 96ca11a7..00000000
--- a/_scss/fontawesome.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Font Awesome Free 5.3.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-@import 'variables';
-@import 'mixins';
-@import 'core';
-@import 'larger';
-@import 'fixed-width';
-@import 'list';
-@import 'bordered-pulled';
-@import 'animated';
-@import 'rotated-flipped';
-@import 'stacked';
-@import 'icons';
-@import 'screen-reader';
diff --git a/assets/css/my-remark.scss b/assets/css/my-remark.scss
index 66a5a5e4..50847cf3 100644
--- a/assets/css/my-remark.scss
+++ b/assets/css/my-remark.scss
@@ -1,7 +1,8 @@
---
# This is the custom style sheet for remark
---
-@import "fontawesome";
+$fa-font-path: "../fonts/font-awesome/";
+@import 'font-awesome.min.css';
@import "remark-base";
$body-font: 24pt;
$code-font: 20pt;
diff --git a/assets/css/site.scss b/assets/css/site.scss
index e0797e68..9640fa7b 100644
--- a/assets/css/site.scss
+++ b/assets/css/site.scss
@@ -4,8 +4,7 @@
@charset "utf-8";
$fa-font-path: "../fonts/font-awesome/";
-
-@import "fontawesome";
+@import 'font-awesome.min.css';
@import "{{site.theme}}";
$font-size-base: 1rem;
diff --git a/assets/css/style.css b/assets/css/style.css
deleted file mode 100644
index 5c1e2c6e..00000000
--- a/assets/css/style.css
+++ /dev/null
@@ -1,175 +0,0 @@
-.main-content h1, .main-content h2, .main-content h3, .main-content h4, .main-content h5, .main-content h6 {
- color: #363C74;
-}
-
-.caption-frame {
- position: top;
- float: top;
- width: 100%;
- height: 200px;
-}
-
-.marknav { text-align: left; }
-.marknav a { position: absolute; left: -10000px; width: 1px; height: 1px; overflow: hidden; }
-.marknav a:focus, .marknav a:active { position: static; left: 0; width: auto; height: auto; overflow: visible; text-decoration: underline; }
-
-
-ul#markdown-toc {
- min-width: 696px;
- list-style: none;
- padding-top: 20px;
-}
-
-ul#markdown-toc li{
- display: inline;
- padding: 5px;
- background-color: #e9ecef;
- style: bold;
-}
-
-ul li.tbd {
- color: red;
-}
-
-h1.tbd {
- background-image: linear-gradient(to left, #bdd5ea, #363c74);
- color: lightcoral;
- padding: 5px;
-}
-
-p.tbd #tbd{
- color: red;
-}
-
-dl dd.tbd {
- color: #660000;
-}
-
-h1.week{
- background-image: linear-gradient(to left, #bdd5ea, #363c74);
- color: white;
- padding:5px;
-}
-
-dl dt.lecture {
- style:bold;
- font-size: large;
- background-color: #E3E9F9;
- padding:5px;
-}
-
-dl dt.holiday {
- style:bold;
- font-size: large;
- background-color: #363C74;
- color: #E3E9F9;
- padding:5px;
-}
-
-dl dt.cancelled {
- style:bold;
- font-size: large;
- background-color: red;
- color: #E3E9F9;
- padding:5px;
-}
-
-dl dt.lab {
- style:bold;
- font-size: large;
- background-color: #EBF9E8;
- padding:5px;
-}
-
-.navbar {
- background-color: #363C74;
-}
-
-table.schedule {
- border: 2px solid #FFFFFF;
- width: 100%;
- text-align: left;
- table-layout:fixed;
- border-collapse: collapse;
-}
-
-
-#unpublished-warning {
- background-color: #ffe6e6;
- border: 0.15em solid red;
- border-radius: 0.5em;
- color: red;
- font-size: large;
- padding: 0.25em 0.5em;
- margin-bottom: 1em;
-}
-
-table.schedule td, table.schedule th {
- border: 1px solid #FFFFFF;
- padding: 3px 4px;
-}
-
-table.tbd td, table.tbd th{
- background-color: #ffe6e6;
- border: 2px solid white;
- padding: 3px 4px;
-}
-
-table.schedule tbody td,table.tbd tbody td {
- font-size: 13px;
-}
-
-
-table.schedule td:nth-child(even) {
- background: #EBEBEB;
-}
-table.tbd td:nth-child(even) {
- background: #ffffe6;
-}
-
-table.schedule thead {
- background: #FFFFFF;
- border-bottom: 4px solid #333333;
-}
-table.schedule thead th {
- font-size: 15px;
- font-weight: bold;
- color: #333333;
- text-align: ;
- border-left: 2px solid #333333;
-}
-table.schedule thead th:first-child {
- border-left: none;
-}
-
-table.schedule tfoot {
- font-size: 14px;
- font-weight: bold;
- color: #333333;
- border-top: 4px solid #333333;
-}
-table.schedule tfoot td {
- font-size: 14px;
-}
-
-.page-header {
- background-image: linear-gradient(-120deg, #bdd5ea, #363c74);
- padding-top: 1rem;
-}
-
-.project-tagline {
- padding-bottom: 1rem;
- margin-bottom: 1rem;
-}
-
-img.ta-picture {
- height: 80px;
- max-width: unset;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
-.font-14pt {
- font-size: 12pt;
-}
--
GitLab