From fd20be6ad20651b57f0b00cfe5c14817051b3aa6 Mon Sep 17 00:00:00 2001 From: Thibault Kruse Date: Sun, 13 May 2018 11:54:51 +0900 Subject: [PATCH 1/3] Copy gitignore from master branch --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..addb875 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +scripts/build +scripts/nodesjs/build +node_modules +_site +scripts/python/__pycache__ +scripts/python/*.pyc + +# VS Code +.vs/ From d0d5d61108da3e2e45ec837f34447cce77226bab Mon Sep 17 00:00:00 2001 From: Thibault Kruse Date: Sun, 13 May 2018 11:50:40 +0900 Subject: [PATCH 2/3] Jekyll front matter (document header) now optional: https://blog.github.com/2016-12-09-publishing-with-github-pages-now-as-easy-as-1-2-3/ --- CppCoreGuidelines.md | 3 --- INSTRUCTIONS.txt | 13 ++++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/CppCoreGuidelines.md b/CppCoreGuidelines.md index 0ffbca6..48b661f 100644 --- a/CppCoreGuidelines.md +++ b/CppCoreGuidelines.md @@ -1,6 +1,3 @@ ---- -layout: default ---- # C++ Core Guidelines April 16, 2018 diff --git a/INSTRUCTIONS.txt b/INSTRUCTIONS.txt index 4bfdff0..ca7fb42 100644 --- a/INSTRUCTIONS.txt +++ b/INSTRUCTIONS.txt @@ -4,20 +4,15 @@ How to update the gh-pages at http://isocpp.github.io/CppCoreGuidelines/ 2. Update date in CppCoreGuidelines.md (and commit & push if updated) 3. git checkout gh-pages 4. git checkout master -- CppCoreGuidelines.md -5. Add the following three lines to the top of CppCoreGuidelines.md: ---- -layout: default ---- - -6. Replace all instances of {{ with {{ "{{" }} +5. Replace all instances of {{ with {{ "{{" }} This escapes the Liquid Template tag which has format {{ liquid }} If you're lucky enough to use vi, your command is: %s/{{/{{ "{{" }}/g Remember to save the file! -7. git commit -a -m "message" -8. git push -9. Refresh the http://isocpp.github.io/CppCoreGuidelines/ to verify that the +6. git commit -a -m "message" +7. git push +8. Refresh the http://isocpp.github.io/CppCoreGuidelines/ to verify that the build succeeded. If not, check your email! If the page fails to build, you'll get a mail explaining why. From b1a75ea7ed47a55ab8922868af009bedb20bf2ac Mon Sep 17 00:00:00 2001 From: Thibault Kruse Date: Sun, 13 May 2018 11:45:19 +0900 Subject: [PATCH 3/3] provide paddings consistently in codeblcoks with/without highlight --- public/css/custom.css | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 61b4a3b..1d64f83 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -35,16 +35,21 @@ /** same style for highlighted, non-highlight */ .cpp.hljs { - overflow-x: unset; - padding: unset; + overflow-x: unset; +} + +/** override poole.css */ +pre code { + /* same as hljs */ + padding: 0.5em; } /** highlight js change colors (overrides style) */ .hljs-comment { - color: #008000; + color: #008000; } .hljs-meta { - color: #2b91af; + color: #2b91af; } .zip_download_link {