diff --git a/.gitignore b/.gitignore index 666de10..19cb45c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ _site .sass-cache .jekyll-metadata Gemfile.lock +gems/ diff --git a/README.md b/README.md index 580b87a..3bcba63 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SGA Website # ## Installing ## -* `bundle install` - This may required elevated privileges, depending on the machine. +* `bundle install --path gems/` ## Running ## * `bundle exec jekyll serve --port $PORT` where `$PORT` is desired port. diff --git a/_config.yml b/_config.yml index 7b3c891..0b2df4f 100644 --- a/_config.yml +++ b/_config.yml @@ -20,13 +20,14 @@ description: > # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: tjSGA -github_username: willzhang05 +#github_username: willzhang05 permalink: pretty # Build settings markdown: kramdown #theme: minima plugins: - jekyll-feed +exclude: [gems] # Exclude from processing. # The following items will not be processed, by default. Create a custom list diff --git a/css/footer.css b/css/footer.css index d75e2eb..c6bf5eb 100644 --- a/css/footer.css +++ b/css/footer.css @@ -32,7 +32,7 @@ button.social#tw { } button.social#flickr { - background: url('../icons/flickr.jpg'); + background: url('../icons/flickr.png'); background-size: cover; background-color: #fff; } diff --git a/icons/fb.jpg b/icons/fb.jpg index 4c2c68e..e73cded 100644 Binary files a/icons/fb.jpg and b/icons/fb.jpg differ diff --git a/icons/flickr.jpg b/icons/flickr.jpg deleted file mode 100644 index 54cce7b..0000000 Binary files a/icons/flickr.jpg and /dev/null differ diff --git a/icons/flickr.png b/icons/flickr.png new file mode 100644 index 0000000..5b17015 Binary files /dev/null and b/icons/flickr.png differ diff --git a/icons/mail.jpg b/icons/mail.jpg index b7ddff0..98462e5 100644 Binary files a/icons/mail.jpg and b/icons/mail.jpg differ diff --git a/icons/tw.jpg b/icons/tw.jpg index 5372cef..62a15b3 100644 Binary files a/icons/tw.jpg and b/icons/tw.jpg differ diff --git a/run.sh b/run.sh index 0379d6b..f17b83f 100755 --- a/run.sh +++ b/run.sh @@ -6,6 +6,6 @@ #/web/activities/ghs/public/env/bin/python run.py $PORT #export PATH=$PATH:/home/2018wzhang/.gem/ruby/2.3.0/bin; #/home/2018wzhang/.gem/ruby/2.3.0/bin/bundler exec jekyll serve --port $PORT -jekyll serve --port $PORT +bundle exec jekyll serve --port $PORT #/web/activities/ghs/public/env/bin/python /web/activities/ghs/public/ghswebsite/app.py $PORT