Merge branch 'master' of github.com:daattali/beautiful-jekyll into up…

…date-from-upstream

* 'master' of github.com:daattali/beautiful-jekyll: (109 commits)
  Addes a .box-success class (daattali#469)
  Integration with just-comments (daattali#468)
  German translation improvement (daattali#456)
  README.md: add solution of write permission when setup docker env (daattali#450)
  Correct typo introduced at fe40d41 (daattali#449)
  Fixed avatar img link on LINE51 (contained space) (daattali#448)
  Fix Staticman's raw JSON response in daattali#440 (daattali#444)
  Update staticman.yml
  Update _config.yml
  Update README.md
  Update head.html
  Add newline to EOF (daattali#442)
  [Feature] Staticman v3 Support (daattali#440)
  http -> https (daattali#439)
  add missing https in link (daattali#433)
  Updates github-pages to v193 (daattali#426)
  fix security vulnerabilities (daattali#423)
  Moved Google Analytics to the Head (daattali#419)
  Create issue_template.md
  Update pull_request_template.md
  ...

.gitattributes

@@ -0,0 +1,48 @@
+# Define standard eol format
+
+# Web Files
+*.html text eol=lf
+*.md text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+
+# Jekyll related files
+*.yml text eol=lf
+
+# Git related files
+.gittattributes text eol=lf
+.gitignore text eol=lf
+.gitkeep text eol=lf
+
+# Ruby files
+*.rb text eol=lf
+Gemfile text eol=lf
+Gemfile.lock text eol=lf
+
+# Github specific fies
+LICENCE text eol=lf
+
+# Docker specific files
+Dockerfile text eol=lf
+
+# VSCode files
+*.json text eol=lf
+
+# General multimedia files
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.png binary
+*.t3x binary
+*.t3d binary
+*.exe binary
+*.data binary
+*.ttf binary
+*.eof binary
+*.eot binary
+*.swf binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.ogg binary
+*.flv binary

CHANGELOG.md

@@ -4,6 +4,32 @@ This file lists all non-trivial changes to Beautiful Jekyll.
 
 I often make small changes to documentation, to the demo site, or to the general look-and-feel. These changes will not be listed here. Any other minor changes will also not be listed here.
 
+**2018-12-24** Add support for Staticman comments (#440) (thanks @VincentTam)
+
+**2018-10-19** Move Google Analytics to the head (#419) (thanks @jpvicari)
+
+**2018-06-08** Add support for Facebook comments (#350) (thanks @npes87184)
+
+**2018-02-22** Automatically generate sitemap (#323) (thanks @JosemyDuarte)
+
+**2018-01-18** Add clickable tags to each post and a tags index page, works for GitHub sites (#307) (thanks @OCram85)
+
+**2018-01-14** Redo Dockerfile (#302) (thanks @jennydaman)
+
+**2018-01-06** More color personalization options (#297 and #299) (thanks @jennydaman)
+
+**2018-01-05** Abstract the social networks logic (thanks @OCram85)
+
+**2018-01-03** Avatar image no longer causes a ghost click (thanks @alefi87)
+
+**2017-10-16** Add GitHub buttons to posts (#265) (thanks @yonicd)
+
+**2017-09-04** Ability to change colour/image of navbar/footer/body
+
+**2017-08-17** Add support for notification, error, and warning boxes in markdown (#227) (thanks @OCram85)
+
+**2017-08-12** Add social buttons for twitch, yelp, and steam (#234) (thanks @TheRealBenForce)
+
 **2017-03-30** Make the footer contact links friendly for screen readers (thanks @eugenius1)
 
 **2017-03-30** Started a CHANGELOG file (thanks @eugenius1)
@@ -16,7 +42,7 @@ I often make small changes to documentation, to the demo site, or to the general
 
 **2016-12-25** Allow dynamic images on each blog post (#143) (thanks @bbritten)
 
-**2016-12-15** Support `title-img` config param to have image in the navbar instead of text 
+**2016-12-15** Support `title-img` config param to have image in the navbar instead of text
 
 **2016-12-08** Add support for phone numbers in footer; fix #136
 
@@ -28,7 +54,7 @@ I often make small changes to documentation, to the demo site, or to the general
 
 **2016-07-29** Add CSS styling to code chunks
 
-**2016-07-27** Add clickable tags that lead to a tag page (thanks @epwalsh)
+**2016-07-27** Add clickable tags that lead to a tag page (doesn't work for GitHub hosted sites) (thanks @epwalsh)
 
 **2016-07-21** Add support for twitter cards (sharing on Twitter will be better); fixes #70
 
@@ -38,7 +64,7 @@ I often make small changes to documentation, to the demo site, or to the general
 
 **2016-02-07** Avatar is now conditional (thanks @hristoyankov)
 
-**2016-02-02** Migrate (forced to...) to jekyll 3 
+**2016-02-02** Migrate (forced to...) to jekyll 3
 
 **2016-01-22** Make sure not to include JQuery twice, fixes #29
 

Dockerfile

@@ -1,44 +1,8 @@
-FROM mangar/jekyll:1.0
+FROM jekyll/jekyll
 
-MAINTAINER Marcio Mangar "[email protected]"
+COPY Gemfile .
+COPY Gemfile.lock .
 
-RUN gem install jekyll -v 3.1.6
-RUN gem install bundler
+RUN bundle install --quiet --clean
 
-RUN gem install execjs
-RUN gem install therubyracer
-RUN gem install github-pages
-RUN gem install jekyll-paginate
-RUN gem install jekyll-seo-tag
-RUN gem install jekyll-gist
-RUN gem install json -v 1.8.3
-
-RUN gem install minitest -v 5.9.0
-RUN gem install colorator -v 0.1
-RUN gem install ffi -v 1.9.10
-RUN gem install kramdown -v 1.10.0
-RUN gem install rouge -v 1.10.1
-RUN gem install pkg-config -v 1.1.7
-RUN gem install terminal-table -v 1.6.0
-RUN gem install ethon -v 0.9.0
-RUN gem install nokogiri -v 1.6.8
-RUN gem install activesupport -v 4.2.6
-RUN gem install html-pipeline -v 2.4.1
-RUN gem install jekyll-watch -v 1.4.0
-RUN gem install github-pages-health-check -v 1.1.0
-RUN gem install jekyll-github-metadata -v 2.0.0
-RUN gem install jekyll-mentions -v 1.1.2
-RUN gem install jekyll-redirect-from -v 0.10.0
-RUN gem install jemoji -v 0.6.2
-RUN gem install github-pages -v 82
-
-
-
-RUN mkdir -p /app
-ADD ./ /app
-
-WORKDIR /app
-
-EXPOSE 4000
-
-CMD bundle exec jekyll serve
+CMD ["jekyll", "serve"]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Dean Attali
+Copyright (c) 2015-2018 Dean Attali
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+
+staticman integration
+=================================================================================
+
+The MIT License (MIT)
+
+Copyright (c) 2013-2018 Michael Rose

_config.yml

@@ -30,6 +30,27 @@ avatar: "/img/avatar-icon.png"
 # then specify the following parameter
 # title-img: /path/to/image
 
+# --- Background colour/image options --- #
+
+# Personalize the colors in your website. Colour values can be any valid CSS colour
+
+navbar-col: "#F5F5F5"
+navbar-text-col: "#404040"
+navbar-children-col: "#F5F5F5"
+page-col: "#FFFFFF"
+link-col: "#008AFF"
+hover-col: "#0085A1"
+footer-col: "#F5F5F5"
+footer-text-col: "#777777"
+footer-link-col: "#404040"
+
+# Alternatively, the navbar, footer, and page background can be set to use background images
+# instead of colour
+
+# navbar-img: "/img/bgimage.png"
+# footer-img: "/img/bgimage.png"
+# page-img: "/img/bgimage.png"
+
 # --- Footer options --- #
 
 # Change all these values or delete the ones you don't want.
@@ -39,23 +60,29 @@ author:
   email: "[email protected]"
   github: PhysicsCodingClub
 
-# Select which links to show in the footer
-footer-links-active:
-  email: true
-  github: true
+# Select your active Social Network Links.
+# Uncomment the links you want to show in the footer and add your information to each link.
+# You can reorder the items to define the link order.
+# If you want to add a new link that isn't here, you'll need to also edit the file _data/SocialNetworks.yml
+social-network-links:
   rss: false
-  facebook: false
-  twitter: false
-  google-plus: false
-  reddit: false
-  linkedin: false
-  xing: false
-  stackoverflow: false
-  snapchat: false
-  instagram: false
-  youtube: false
-  spotify: false
-  telephone: false
+  # email: "[email protected]"
+  # facebook: daattali
+  # github: daattali
+  # twitter: daattali
+#  reddit: yourname
+#  google-plus: +DeanAttali
+#  linkedin: daattali
+#  xing: yourname
+#  stackoverflow: "3943160/daattali"
+#  snapchat: deanat78
+#  instagram: deanat78
+#  youtube: user/deanat78
+#  spotify: yourname
+#  telephone: +14159998888
+#  steam: deanat78
+#  twitch: yourname
+#  yelp: yourname
 
 # Select which share links to show in posts
 share-links-active:
@@ -74,6 +101,38 @@ share-links-active:
 # Google Tag Manager ID
 #gtm: ""
 
+# Matomo (aka Piwik) Web statistics
+# Uncomment the following section to enable Matomo. The opt-out parameter controls
+# whether or not you want to allow users to opt out of tracking.
+
+#matomo:
+#  site_id: "9"
+#  uri: "demo.wiki.pro"
+#  opt-out: true
+
+# --- Comments --- #
+
+# Fill in your Disqus shortname (NOT the userid) if you want to support Disqus comments
+# disqus: ""
+# If you want to use just-comments fill with the API Key
+#just-comments: "ABCD-EFGH-IJKL"
+
+# To use Facebook Comments, fill in a Facebook App ID
+# fb_comment_id: ""
+
+# Staticman support
+staticman:
+  repository : # GitHub username/repository eg. "daattali/beautiful-jekyll"
+  branch     : # eg. "master" If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml`
+  endpoint   : # URL of your own deployment (with trailing slash) (will fallback to a public GitLab instance)
+  reCaptcha:
+    # reCaptcha for Staticman (OPTIONAL)
+    # If you use reCaptcha, you must also set these parameters in staticman.yml
+    siteKey  : # Use your own site key, you need to apply for one on Google
+    secret   : # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/<your-site-secret>
+
+# --- Misc --- #
+
 # Facebook App ID
 # fb_app_id: ""
 
@@ -115,8 +174,8 @@ defaults:
       layout: "page"
       show-avatar: true
 
-# Use tags pages (not recommended if you are deploying via GitHub pages, only set to true if deploying locally with ruby)
-link-tags: false
+# Use tags index page and make tags on each post clickable
+link-tags: true
 
 # Exclude these files from production site
 exclude:
@@ -190,6 +249,7 @@ prose:
 
 plugins:
   - jekyll-paginate
+  - jekyll-sitemap
 
 # Beautiful Jekyll / Dean Attali
 # 2fc73a3a967e97599c9763d05e564189