Skip to content

Commit

Permalink
Create .ruby-version and update Beautiful Jekyll (#4)
Browse files Browse the repository at this point in the history
* http -> https (daattali#439)

* [Feature] Staticman v3 Support (daattali#440)

* Added Staicman support

* Corrected template for staticman.yml

* Edit for coherence with _includes/disqus.html

* Updated documentation for Staticman

* Updated License to give credits to Michale Rose

* Update LICENSE

* add more staticman details to readme

* Clearer instructions about reCAPTCHA in YML

* Nest reCAPTCHA param inside Staticman

* Prepend all css selectors with .staticman-comments

Edit suggested by theme owner to avoid CSS rules overriding.

* Add myself to the change log

* Update _config.yml

* Add newline to EOF (daattali#442)

* Update head.html

* Update README.md

* Update _config.yml

* Update staticman.yml

* Fix Staticman's raw JSON response in daattali#440 (daattali#444)

* Fix redirection error in daattali#440

* Corrected jQuery call URL in Staticman script

* Fixed avatar img link on LINE51 (contained space) (daattali#448)

Removed the extra space after {{ site.url }} and before "

* Correct typo introduced at fe40d41 (daattali#449)

* README.md: add solution of write permission when setup docker env (daattali#450)

* README.md: add solution of write permission when setup docker env

Signed-off-by: Yu-Chen Lin <npes87184@gmail.com>

* Update README.md

* German translation improvement (daattali#456)

* Integration with just-comments (daattali#468)

Add support for just-comments

* Addes a .box-success class (daattali#469)

* Added a .box-success class

Added a .box-success class

* Update main.css

* Rename just-comments to JustComments (daattali#492)

* fix issue 491 - header margins disappeared because of css env variable

* Add permission for jekyll user on Gemfile (daattali#503)

* Remove note about permission issues

* R.I.P. Google Plus (daattali#501)

Signed-off-by: Yu-Chen Lin <npes87184@gmail.com>

* Update github-pages plugin (daattali#476)

Update github-pages plugin from version 193 to 197.

Fix daattali#457
Fix daattali#385

* Fix showing background img with non-empty baseurl (daattali#497)

* Fix showing background img with non-empty baseurl

Also switch globally to relative_url for all baseurl prepends,
which is more robust than custom URL mangling

* More site.baseurl -> relative_url conversion

* Fix post image url too (daattali#504)

* Abs link patch (daattali#506)

* Fix absolute URL generation

url and baseurl config for this theme deviates from jekyll standard,
and that results in double inclusion of project path
if this theme is used as project page.

Switching to Jekyll accepted url usage so that
absolute_url filter works.

* Alternate links need to be aboslute

* mention url and baseurl only need to be modified in local dev

* Update readme on new url/baseurl setting changes

* update year in readme

* add credits to @abelcheung in readme

* add a known limitation to readme

* Update _config.yml

* Update README.md

* Update README.md

* Obsoletes navbarlink with relative_url filter (daattali#508)

* Staticman anti-spam suggestion (daattali#509)

* README: add FAQ about mathjax

* show how to center an image

* Refactor code block styles (daattali#516)

* Refactor code block styles

Code block bg adopts to custom user bg color instead of using
hardcoded color, preserving original design as much as possible.

* Revert to linear-gradient(), exchange strip order

repeating-linear-gradient() doesn't generate necessary stripping near
code block borders

* Staticman documentation enhancement (daattali#514)

* Add a link to Staticman: Webhooks

* Clearer README on Staticman reCAPTCHA and endpoint

* Update README after owner's feedback

* Update staticman.yml after owner's feedback

* Further improve Staticman templates

* Corrected Staticman config instructions

* Update staticman.yml

* Update _config.yml

* Update README.md

* fixed typo (daattali#524)

* Staticman - try to avoid spam by using javascript to write the form action (daattali#521)

* Update README.md (daattali#525)

* removed double spaces (daattali#526)

* Reorder scripts in footer (daattali#522)

* Remove fullstop in some Staticman UI text (daattali#529)

* Add support for customizable date format (daattali#533)

* Add support for customizable date format

* Add support for customizable date format

* Add support for customizable date format (daattali#536)

* Use v2 for JustComments (daattali#538)

* Create .ruby-version

* Update Beautiful Jekyll

* Modify files

* Modify files

* Modify files
  • Loading branch information
crweiner authored Sep 18, 2019
1 parent 50a9e79 commit 123b16d
Show file tree
Hide file tree
Showing 39 changed files with 1,127 additions and 174 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ _site
# general
.DS_Store
Thumbs.db
ehthumbs.db
ehthumbs.db
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.4
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ <h1>Whoops, this page doesn't exist.</h1>
<h1>Move along. (404 error)</h1>
<br/>

<img src="{{ site.baseurl }}/img/404-southpark.jpg" />
<img src="{{ 'img/404-southpark.jpg' | relative_url }}" />
</div>
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM jekyll/jekyll

COPY Gemfile .
COPY Gemfile.lock .
COPY --chown=jekyll:jekyll Gemfile .
COPY --chown=jekyll:jekyll Gemfile.lock .

RUN bundle install --quiet --clean

CMD ["jekyll", "serve"]
CMD ["jekyll", "serve"]
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem "github-pages", '193', group: :jekyll_plugins
gem "github-pages", '197', group: :jekyll_plugins

# enable tzinfo-data for local build
# gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
Expand Down
11 changes: 10 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@


The personal website of Chandler Weiner at ChandlerWeiner.com.

I am a biologist by day, WordPress web designer by night, and traveler by weekend.

Built on [Jekyll](https://jekyllrb.com/) running the [Beautiful Jekyll](https://github.com/daattali/beautiful-jekyll) theme.

![octocat](/img/octocat.png)
![octocat](/img/octocat.png)
24 changes: 20 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ social-network-links:
github: crweiner
twitter: c_dubbs
# reddit: yourname
# google-plus: +DeanAttali
# linkedin: daattali
# xing: yourname
# stackoverflow: "3943160/daattali"
Expand All @@ -92,9 +91,8 @@ social-network-links:
# Select which share links to show in posts
share-links-active:
twitter: true
facebook: false
google: false
linkedin: false
facebook: true
linkedin: true

# How to display the link to the website in the footer
# Remove this if you don't want a link in the footer
Expand Down Expand Up @@ -125,9 +123,23 @@ google_analytics: "UA-5616443-3"
# Fill in your Disqus shortname (NOT the userid) if you want to support Disqus comments
# disqus: ""

# If you want to use JustComments fill with the API Key
#just-comments: "ABCD-EFGH-IJKL"

# To use Facebook Comments, fill in a Facebook App ID
# fb_comment_id: ""

# To use Staticman comments, fill in repository, branch, and endpoint
staticman:
repository : # GitHub username/repository eg. "daattali/beautiful-jekyll"
branch : 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 a trailing slash (will fallback to a public GitLab instance) eg. https://<your-api>/v3/entry/github/
reCaptcha:
# reCaptcha for Staticman (OPTIONAL, but recommended for spam protection)
# 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
Expand All @@ -141,6 +153,9 @@ excerpt_length: 50
# and RSS feed title
title-separator: "-"

# Ruby Date Format
date_format: "%B %-d, %Y"

# --- Don't need to touch anything below here (but you can if you want) --- #

# Output options (more information on Jekyll's site)
Expand Down Expand Up @@ -239,6 +254,7 @@ prose:
plugins:
- jekyll-paginate
- jekyll-sitemap
- jekyll-feed

# Beautiful Jekyll / Dean Attali
# 2fc73a3a967e97599c9763d05e564189
7 changes: 1 addition & 6 deletions _data/SocialNetworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ reddit:
baseURL: "https://reddit.com/u/"
icon: "fa-reddit"

google-plus:
name: "Google+"
baseURL: "https://plus.google.com/"
icon: "fa-google-plus"

email:
name: "Email me"
baseURL: "mailto:"
Expand Down Expand Up @@ -78,7 +73,7 @@ telephone:

rss:
name: "RSS"
baseURL: "{{ '/feed.xml' | prepend: site.baseurl }}"
baseURL: "{{ '/feed.xml' | relative_url }}"
icon: "fa-rss"

steam:
Expand Down
Loading

0 comments on commit 123b16d

Please sign in to comment.