Commit 249c8350 authored by Vincent Tam's avatar Vincent Tam 💻
Browse files

Merge remote-tracking branch 'upstream/master' into fs-pages

parents b38de881 94161dbe
......@@ -118,11 +118,11 @@ To use Facebook comments, create a Facebook app using [Facebook developers](http
#### Staticman comments
To use Staticman, you first need to invite `staticmanlab1` as a collaborator to your repository (by going to your repository **Settings** page, navigate to the **Collaborators** tab, and add the username `staticmanlab1`), and then accept the invitation by going to `https://staticman-frama.herokuapp.com/v3/connect/gitlab/<username>/<repo-name>`. Lastly, fill in your `repository` and `branch` in the Staticman section of `_config.yml`.
To use Staticman, you first need to invite `staticmanlab` as a collaborator to your repository (by going to your repository **Settings** page, navigate to the **Collaborators** tab, and add the username `staticmanlab`), and then accept the invitation by going to `https://staticman3.herokuapp.com/v3/connect/github/<username>/<repo-name>`. Lastly, fill in the `staticman` parameters in the Staticman section of `_config.yml`. You may also choose a different Staticman instance other than `staticmanlab`.
![Staicman invitation screenshot](https://user-images.githubusercontent.com/5748535/50357920-e8f25500-0557-11e9-9cb6-73f8b575c4f0.png)
Optional: It is suggested to enable reCAPTCHA to avoid massive spam comments. You may refer to `_config.yml` for detailed instructions.
Optional: You may want to configure a webhook to prevent old inactive branches (representing approved comments) from stacking up. You can refer to [Staticman's documenation](https://staticman.net/docs/webhooks) for details. Make sure to input the **Payload URL** according to your chosen `endpoint`. For example, the default `endpoint` is `https://staticman3.herokuapp.com/v3/entry/github/`, so the corresponding **Payload URL** should be `https://staticman3.herokuapp.com/v1/webhook`.
#### JustComments
......@@ -291,6 +291,10 @@ The default style of Beautiful Jekyll is to feature the blog feed on the front p
Unfortunately, this is a no-answer! There isn't a one-size-fits-all solution to this, because every person will view your site on a different browser with different dimensions. Some browsers will have very wide aspect ratio, some will be narrower, some will be vertical (such as phones), different phones have different screens, etc. The image will always be centered, so the only tip I can give is that you should make sure the important part of the image is in the middle so that it'll always show. Other than that, every browser will show a different clipping of the image.
#### How do I use MathJax equations in my posts?
MathJax can be easily integrated into your website with a one-line addition. You can see [this discussion](https://github.com/daattali/beautiful-jekyll/issues/195) for more information.
#### My project page appear to be broken after a recent update!
In June 2019, some URL related settings have been adjusted to be more in-line with how Jekyll uses them officially. Project Page absolute links might appear to be broken if you haven't propagated all necessary changes to your local templates, or if you have created additional templates making use of old settings. If a link contains a duplicated project path component, this is most likely the cause. In summary:
......
......@@ -127,15 +127,16 @@ url-pretty: "MyWebsite.com" # eg. "deanattali.com/beautiful-jekyll"
# To use Facebook Comments, fill in a Facebook App ID
# fb_comment_id: ""
# Staticman
# To use Staticman comments, fill in repository, branch, and endpoint
staticman:
repository : "VincentTam/tempsite" # GitHub username/repo-name e.g. "daattali/beautiful-jekyll"
branch : "fs-pages" # "master"
endpoint : "https://staticman-frama.herokuapp.com/v3/entry/gitlab/" # URL of your own deployment with trailing slash, will fallback to the public GitLab instance
# reCaptcha for Staticman (OPTIONAL)
repository : "VincentTam/tempsite" # GitHub username/repository eg. "daattali/beautiful-jekyll"
branch : "fs-pages" # If you're not using `master` branch, then you also need to update the `branch` parameter in `staticman.yml`
endpoint : "https://staticman-frama.herokuapp.com/v3/entry/gitlab/" # URL of your own deployment, with a trailing slash (will fallback to a public GitLab instance) eg. https://<your-api>/v3/entry/github/
reCaptcha:
siteKey : 6Lcv8G8UAAAAAEqV1Y-XEPum00C_DxhD6O--qkFo # Use your OWN site key. You may apply to Google for one.
secret : pPaZ28LwxNHq6vpogi3AMNeJespBWnKWCDTzT1BSvrtrHeWMbwC0zpv37EdXGZD2/JE0yA6jB6ZpmJXxMN4cRcnwUmhiMmEA8CS6vVYDSiWkq8qgkECvTGSdufydarZTbQPNqlZvqi9JkL2vYX4EZW0JGWq0zmenp3IFI/nfz9VCxRNIA4ZU4qnJYsL+QFvhXXXgLMEKqoZSPLeZ89gwZtVmkzCcw9KZaegc5cMsVQGVD133Md5Q8AlyrVmTklezLlz2mxR7iJ57dk1RNvIRgvXBhzxyEaSW7XJYzgtXAlZEv3Ifh+sYyfS4wMeE8f+uxM0opoS5/ewKH2/xqw6IEw== # (!) ENCRYPT your password by opening https://staticman-frama.herokuapp.com/v3/encrypt/{your-site-secret}
# reCaptcha for Staticman (OPTIONAL, but recommended for spam protection)
# If you use reCaptcha, you must also set these parameters in staticman.yml
siteKey : 6Lcv8G8UAAAAAEqV1Y-XEPum00C_DxhD6O--qkFo # Use your own site key, you need to apply for one on Google
secret : pPaZ28LwxNHq6vpogi3AMNeJespBWnKWCDTzT1BSvrtrHeWMbwC0zpv37EdXGZD2/JE0yA6jB6ZpmJXxMN4cRcnwUmhiMmEA8CS6vVYDSiWkq8qgkECvTGSdufydarZTbQPNqlZvqi9JkL2vYX4EZW0JGWq0zmenp3IFI/nfz9VCxRNIA4ZU4qnJYsL+QFvhXXXgLMEKqoZSPLeZ89gwZtVmkzCcw9KZaegc5cMsVQGVD133Md5Q8AlyrVmTklezLlz2mxR7iJ57dk1RNvIRgvXBhzxyEaSW7XJYzgtXAlZEv3Ifh+sYyfS4wMeE8f+uxM0opoS5/ewKH2/xqw6IEw== # ENCRYPT your password by going to https://staticman3.herokuapp.com/v3/encrypt/<your-site-secret>
# --- Misc --- #
......
......@@ -28,6 +28,10 @@ How about a yummy crepe?
![Crepe](https://s3-media3.fl.yelpcdn.com/bphoto/cQ1Yoa75m2yUFFbY2xwuqw/348s.jpg)
It can also be centered!
![Crepe](https://s3-media3.fl.yelpcdn.com/bphoto/cQ1Yoa75m2yUFFbY2xwuqw/348s.jpg){: .center-block :}
Here's a code chunk:
~~~
......
......@@ -668,37 +668,43 @@ pre {
font-size: 16px;
line-height: 1.5em;
}
pre code {
white-space: pre;
}
pre.highlight, .highlight > pre, td.code pre {
background-color: #FAFAFA;
background-image: linear-gradient(#F9F9F9 50%, #FDFDFD 50%);
background-repeat: repeat;
background-size: 3em 3em;
background-position: 0px 10px;
border-left: 7px solid #444;
}
code table, code table td, code table th, code table tbody, code table tr,
td.gutter pre {
padding: 0;
.highlight pre {
border: none;
background-color: #fff;
background: none;
margin: 0;
}
.highlight > pre {
background-image: linear-gradient(
rgba(0,0,0,0.06), rgba(0,0,0,0.06) 1.5em, rgba(0,0,0,0.03) 1.5em, rgba(0,0,0,0.03) 3em);
background-size: auto 3em;
background-position-y: 10px;
border: 1px solid rgba(0,0,0,0.1);
border-left: 7px solid #444;
}
.highlight > pre:not([class~="highlight"]) { /* code block with line number */
padding: 0;
}
.highlight > pre.highlight {
padding: 9.5px;
.highlight table, .highlight tr, .highlight td { /* to be removed after fixing table styles */
border: none;
background: none;
padding: 0;
margin: 0;
}
td.code pre {
border-width: 0 0 0 2px;
border-style: solid;
border-color: #444;
.highlight pre.lineno {
color: rgba(0,0,0,0.3);
border-radius: 0;
border-right: 2px solid #444;
}
/* Make line numbers unselectable: excludes line numbers from copy-paste user ops */
.lineno {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
td.gutter {
padding-top: 3px;
.lineno::selection, .lineno::-moz-selection {
background: none;
}
/* --- Social media sharing section --- */
......
......@@ -59,8 +59,3 @@
.highlight .vg { color: #008080 } /* Name.Variable.Global */
.highlight .vi { color: #008080 } /* Name.Variable.Instance */
.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
/* Make line numbers unselectable: excludes line numbers from copy-paste user ops */
.highlight .lineno {color:rgba(0,0,0,0.3);padding: 0 10px;-webkit-user-select: none;-moz-user-select: none; -o-user-select: none;}
.lineno::-moz-selection {background-color: transparent;} /* Mozilla specific */
.lineno::selection {background-color: transparent;} /* Other major browsers */
......@@ -4,7 +4,8 @@
# another one to handle posts.
# To encrypt strings use the following endpoint:
# https://{STATICMAN API INSTANCE}/v3/encrypt/{TEXT TO BE ENCRYPTED}
# {STATICMAN API INSTANCE} defaults to staticman3.herokuapp.com
# {STATICMAN API INSTANCE} should match the `endpoint` in the theme config
# file. It defaults to "staticman3.herokuapp.com".
comments:
# (*) REQUIRED
......@@ -97,8 +98,10 @@ comments:
email: md5
# reCAPTCHA (OPTIONAL)
# Register your domain at https://www.google.com/recaptcha/ and choose reCAPTCHA V2
# Use your OWN siteKey and secret.
# To enable reCAPTCHA:
# 1. Set `enabled` to `true`
# 2. Register your domain at https://www.google.com/recaptcha/ and choose reCAPTCHA V2
# 3. Uncomment `siteKey` and `secret` and fill them in with your values
reCaptcha:
enabled: true
siteKey: "6Lcv8G8UAAAAAEqV1Y-XEPum00C_DxhD6O--qkFo"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment