diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000000..c1d2ba2b3c75 --- /dev/null +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b184e9b55a7..33fb2b70b233 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Dockerfile b/Dockerfile index 9459b372e7f3..45c8cf152864 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,8 @@ -FROM mangar/jekyll:1.0 +FROM jekyll/jekyll -MAINTAINER Marcio Mangar "marcio.mangar@gmail.com" +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"] diff --git a/LICENSE b/LICENSE index 72fab4a3dc79..125834377020 100644 --- a/LICENSE +++ b/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 diff --git a/_config.yml b/_config.yml index ff5f7ec9b130..33dfa9539611 100644 --- a/_config.yml +++ b/_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: "physics-coding-club-group@york.ac.uk" 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: "someone@example.com" + # 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/ + +# --- 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 diff --git a/_data/SocialNetworks.yml b/_data/SocialNetworks.yml new file mode 100644 index 000000000000..d0a263502d1b --- /dev/null +++ b/_data/SocialNetworks.yml @@ -0,0 +1,97 @@ +# You can define your custom social network links here. +# Use the same key you added in _config.yml -> social-network-links. +# In addition to that you need to specify the following properties: +# name: Specify a user-friendly name that will be used as a link title +# baseURL: Define a base URL which will be combined with the value of +# site.social-network-links. +# icon: Specify a valid fontawesome icon class + +facebook: + name: "Facebook" + baseURL: "https://www.facebook.com/" + icon: "fa-facebook" + +github: + name: "GitHub" + baseURL: "https://github.com/" + icon: "fa-github" + +twitter: + name: "Twitter" + baseURL: "https://twitter.com/" + icon: "fa-twitter" + +reddit: + name: "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:" + icon: "fa-envelope" + +linkedin: + name: "LinkedIn" + baseURL: "https://linkedin.com/in/" + icon: "fa-linkedin" + +xing: + name: "Xing" + baseURL: "https://www.xing.com/profile/" + icon: "fa-xing" + +stackoverflow: + name: "StackOverflow" + baseURL: "https://stackoverflow.com/users/" + icon: "fa-stack-overflow" + +snapchat: + name: "Snapchat" + baseURL: "https://www.snapchat.com/add/" + icon: "fa-snapchat-ghost" + +instagram: + name: "Instagram" + baseURL: "https://www.instagram.com/" + icon: "fa-instagram" + +youtube: + name: "YouTube" + baseURL: "https://www.youtube.com/" + icon: "fa-youtube" + +spotify: + name: "Spotify" + baseURL: "https://open.spotify.com/user/" + icon: "fa-spotify" + +telephone: + name: "Phone" + baseURL: "tel:" + icon: "fa-phone" + +rss: + name: "RSS" + baseURL: "{{ '/feed.xml' | prepend: site.baseurl }}" + icon: "fa-rss" + +steam: + name: "Steam" + baseURL: "https://steamcommunity.com/id/" + icon: "fa-steam" + +twitch: + name: "Twitch" + baseURL: "https://www.twitch.tv/" + icon: "fa-twitch" + +yelp: + name: "Yelp" + baseURL: "https://{{ site.author.yelp }}.yelp.com" + icon: "fa-yelp" diff --git a/_data/ui-text.yml b/_data/ui-text.yml new file mode 100644 index 000000000000..939fd5342bbc --- /dev/null +++ b/_data/ui-text.yml @@ -0,0 +1,494 @@ +# User interface text and labels + +# English (default) +# ----------------- +en: &DEFAULT_EN + comments_label : "Leave a comment" + comments_title : "Comments" + comment_form_info : "Your email address will not be published. Required fields are marked" + comment_form_comment_label : "Comment" + comment_form_md_info : "Markdown is supported." + comment_form_name_label : "Name" + comment_form_email_label : "Email address" + comment_form_website_label : "Website (optional)" + comment_btn_submit : "Submit comment" + comment_btn_submitted : "Submitted" + comment_success_msg : "Thanks for your comment! It will show on the site once it has been approved." + comment_error_msg : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." +en-US: + <<: *DEFAULT_EN +en-CA: + <<: *DEFAULT_EN +en-GB: + <<: *DEFAULT_EN +en-AU: + <<: *DEFAULT_EN + +# Spanish +# ------- +es: &DEFAULT_ES + comments_label : "Dejar un commentario" + comments_title : "Comentar" + comment_form_info : "Su dirección de correo no será publicada. Se han resaltado los campos requeridos" + comment_form_comment_label : "Comentario" + comment_form_md_info : "Markdown está soportado." + comment_form_name_label : "Nombre" + comment_form_email_label : "Dirección de E-mail" + comment_form_website_label : "Sitio web (opcional)" + comment_btn_submit : "Enviar Commentario" + comment_btn_submitted : "Enviado" + comment_success_msg : "Gracias por su comentario!, Este se visualizará en el sitio una vez haya sido aprobado" + comment_error_msg : "Lo sentimos, ha ocurrido un error al enviar su comentario. Por favor asegurese que todos los campos han sido diligenciados e intente de nuevo" +es-ES: + <<: *DEFAULT_ES +es-CO: + <<: *DEFAULT_ES + +# French +# ------ +fr: &DEFAULT_FR + comments_label : "Laisser un commentaire" + comments_title : "Commentaires" + comment_form_info : "Votre adresse email ne sera pas visible. Les champs obligatoires sont marqués" + comment_form_comment_label : "Commentaire" + comment_form_md_info : "Markdown est supporté." + comment_form_name_label : "Nom" + comment_form_email_label : "Adresse mail" + comment_form_website_label : "Site web (optionnel)" + comment_btn_submit : "Envoyer" + comment_btn_submitted : "Envoyé" + comment_success_msg : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé." + comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." +fr-FR: + <<: *DEFAULT_FR +fr-BE: + <<: *DEFAULT_FR +fr-CH: + <<: *DEFAULT_FR + +# Turkish +# ------- +tr: &DEFAULT_TR + comments_label : "Yorum yapın" + comments_title : "Yorumlar" + comment_form_info : "Email adresiniz gösterilmeyecektir. Zorunlu alanlar işaretlenmiştir" + comment_form_comment_label : "Yorumunuz" + comment_form_md_info : "Markdown desteklenmektedir." + comment_form_name_label : "Adınız" + comment_form_email_label : "Email adresiniz" + comment_form_website_label : "Websiteniz (opsiyonel)" + comment_btn_submit : "Yorum Yap" + comment_btn_submitted : "Gönderildi" + comment_success_msg : "Yorumunuz için teşekkürler! Yorumunuz onaylandıktan sonra sitede gösterilecektir." + comment_error_msg : "Maalesef bir hata oluştu. Lütfen zorunlu olan tüm alanları doldurduğunuzdan emin olun ve sonrasında tekrar deneyin." +tr-TR: + <<: *DEFAULT_TR + +# Portuguese +# ---------- +pt: &DEFAULT_PT + comments_label : "Deixe um Comentário" + comments_title : "Comentários" + comment_form_info : "O seu endereço email não será publicado. Os campos obrigatórios estão assinalados" + comment_form_comment_label : "Comentário" + comment_form_md_info : "Markdown é suportado." + comment_form_name_label : "Nome" + comment_form_email_label : "Endereço Email" + comment_form_website_label : "Site (opcional)" + comment_btn_submit : "Sumbeter Comentário" + comment_btn_submitted : "Submetido" + comment_success_msg : "Obrigado pelo seu comentário! Será visível no site logo que aprovado." + comment_error_msg : "Lamento, ocorreu um erro na sua submissão. Por favor verifique se todos os campos obrigatórios estão corretamente preenchidos e tente novamente." +pt-PT: + <<: *DEFAULT_PT +# Brazilian Portuguese +pt-BR: + comments_label : "Deixe um comentário" + comments_title : + comment_form_info : "Seu email não será publicado. Os campos obrigatórios estão marcados" + comment_form_comment_label : "Comentário" + comment_form_md_info : "Markdown é suportado." + comment_form_name_label : "Nome" + comment_form_email_label : "Email" + comment_form_website_label : "Site (opcional)" + comment_btn_submit : "Enviar Comentário" + comment_btn_submitted : "Enviado" + comment_success_msg : "Obrigado pelo seu comentário! Ele aparecerá no site assim que for aprovado." + comment_error_msg : "Desculpe, ocorreu um erro no envio. Por favor verifique se todos os campos obrigatórios foram preenchidos e tente novamente." + +# Italian +# ------- +it: &DEFAULT_IT + comments_label : "Scrivi un commento" + comments_title : + comment_form_info : "Il tuo indirizzo email non sarà pubblicato. Sono segnati i campi obbligatori" + comment_form_comment_label : "Commenta" + comment_form_md_info : "Il linguaggio Markdown è supportato" + comment_form_name_label : "Nome" + comment_form_email_label : "Indirizzo email" + comment_form_website_label : "Sito Web (opzionale)" + comment_btn_submit : "Invia commento" + comment_btn_submitted : "Inviato" + comment_success_msg : "Grazie per il tuo commento! Verrà visualizzato nel sito una volta che sarà approvato." + comment_error_msg : "C'è stato un errore con il tuo invio. Assicurati che tutti i campi richiesti siano stati completati e riprova." +it-IT: + <<: *DEFAULT_IT + +# Chinese (zh-CN Chinese - China) +# -------------------------------- +zh: &DEFAULT_ZH_HANS + comments_label : "留下评论" + comments_title : "评论" + comment_form_info : "您的电子邮箱地址并不会被展示。请填写标记为必须的字段。" + comment_form_comment_label : "评论" + comment_form_md_info : "Markdown语法已支持。" + comment_form_name_label : "姓名" + comment_form_email_label : "电子邮箱" + comment_form_website_label : "网站（可选）" + comment_btn_submit : "提交评论" + comment_btn_submitted : "已提交" + comment_success_msg : "感谢您的评论！被批准后它会立即在此站点展示。" + comment_error_msg : "很抱歉，您的提交存在错误。请确保所有必填字段都已填写正确，然后再试一次。" +zh-CN: + <<: *DEFAULT_ZH_HANS +zh-SG: + <<: *DEFAULT_ZH_HANS +# Taiwan (Traditional Chinese) +zh-TW: &DEFAULT_ZH_HANT + comments_label : "留言" + comments_title : "留言內容" + comment_form_comment_label : "留言內容" + comment_form_md_info : "支援Markdown語法。" + comment_form_name_label : "名字" + comment_form_email_label : "電子信箱帳號" + comment_form_website_label : "網頁 (可選填)" + comment_btn_submit : "送出留言" + comment_btn_submitted : "已送出" + comment_success_msg : "感謝您的留言！ 審核後將會顯示在站上。" + comment_error_msg : "抱歉，部份資料輸入有問題。請確認資料填寫正確後再試一次。" +zh-HK: + <<: *DEFAULT_ZH_HANT + +# German / Deutsch +# ---------------- +de: &DEFAULT_DE + comments_label : "Hinterlasse einen Kommentar" + comments_title : "Kommentare" + comment_form_info : "Die E-Mail Adresse wird nicht veröffentlicht. Benötigte Felder sind markiert" + comment_form_comment_label : "Kommentar" + comment_form_md_info : "Markdown wird unterstützt." + comment_form_name_label : "Name" + comment_form_email_label : "E-Mail-Adresse" + comment_form_website_label : "Webseite (optional)" + comment_btn_submit : "Kommentar absenden" + comment_btn_submitted : "Versendet" + comment_success_msg : "Danke für den Kommentar! Er wird nach Prüfung auf der Seite angezeigt." + comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte fülle alle benötigten Felder aus und versuche es erneut." +de-DE: + <<: *DEFAULT_DE +de-AT: + <<: *DEFAULT_DE +de-CH: + <<: *DEFAULT_DE +de-BE: + <<: *DEFAULT_DE +de-LI: + <<: *DEFAULT_DE +de-LU: + <<: *DEFAULT_DE + +# Nepali (Nepal) +# -------------- +ne: &DEFAULT_NE + comments_label : "टिप्पणी दिनुहोस्" + comments_title : "टिप्पणीहरू" + comment_form_info : "तपाइँको इमेल ठेगाना प्रकाशित गरिने छैन।आवश्यक जानकारीहरुमा चिन्ह लगाइको छ" + comment_form_comment_label : "टिप्पणी" + comment_form_md_info : "मार्कडाउन समर्थित छ।" + comment_form_name_label : "नाम" + comment_form_email_label : "इमेल ठेगाना" + comment_form_website_label : "वेबसाइट (वैकल्पिक)" + comment_btn_submit : "टिप्पणी दिनुहोस् " + comment_btn_submitted : "टिप्पणी भयो" + comment_success_msg : "तपाईंको टिप्पणीको लागि धन्यवाद! एक पटक यो अनुमोदन गरेपछी यो साइटमा देखाउनेछ।" + comment_error_msg : "माफ गर्नुहोस्, तपाईंको टिप्पणी त्रुटि थियो।सबै आवश्यक जानकारीहरु पूरा गरिएको छ भने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।" +ne-NP: + <<: *DEFAULT_NE + +# Korean +# ------ +ko: &DEFAULT_KO + comments_label : "댓글남기기" + comments_title : "댓글" + comment_form_info : "이메일은 공개되지 않습니다. 작성 필요 필드:" + comment_form_comment_label : "댓글" + comment_form_md_info : "마크다운을 지원합니다." + comment_form_name_label : "이름" + comment_form_email_label : "이메일" + comment_form_website_label : "웹사이트(선택사항)" + comment_btn_submit : "댓글 등록" + comment_btn_submitted : "등록됨" + comment_success_msg : "감사합니다! 댓글이 머지된 후 확인하실 수 있습니다." + comment_error_msg : "댓글 등록에 문제가 있습니다. 필요 필드를 작성했는지 확인하고 다시 시도하세요." +ko-KR: + <<: *DEFAULT_KO + +# Russian / Русский +# ----------------- +ru: &DEFAULT_RU + comments_label : "Оставить комментарий" + comments_title : "Комментарии" + comment_form_info : "Ваш адрес электронной почты не будет опубликован. Обязательные поля помечены" + comment_form_comment_label : "Комментарий" + comment_form_md_info : "Поддерживается синтаксис Markdown." + comment_form_name_label : "Имя" + comment_form_email_label : "Электронная почта" + comment_form_website_label : "Ссылка на сайт (необязательно)" + comment_btn_submit : "Оставить комментарий" + comment_btn_submitted : "Отправлено" + comment_success_msg : "Спасибо за Ваш комментарий! Он будет опубликован на сайте после проверки." + comment_error_msg : "К сожалению, произошла ошибка с отправкой комментария. Пожалуйста, убедитесь, что все обязательные поля заполнены и попытайтесь снова." +ru-RU: + <<: *DEFAULT_RU + +# Lithuanian / Lietuviškai +# ------------------------ +lt: &DEFAULT_LT + comments_label : "Palikti komentarą" + comments_title : "Komentaras" + comment_form_info : "El. pašto adresas nebus viešinamas. Būtini laukai pažymėti." + comment_form_comment_label : "Komentaras" + comment_form_md_info : "Markdown palaikomas." + comment_form_name_label : "Vardas" + comment_form_email_label : "El. paštas" + comment_form_website_label : "Tinklapis (nebūtina)" + comment_btn_submit : "Komentuoti" + comment_btn_submitted : "Įrašytas" + comment_success_msg : "Ačiū už komentarą! Jis bus parodytas kai bus patvirtintas." + comment_error_msg : "Atleiskite, įvyko netikėta klaida įrašant komentarą. Pasitikrinkite ar užpildėte visus būtinus laukus ir pamėginkite dar kartą." +lt-LT: + <<: *DEFAULT_LT + +# Greek +# ----- +gr: &DEFAULT_GR + comments_label : "Αφήστε ένα σχόλιο" + comments_title : "Σχόλια" + comment_form_info : "Η διεύθυνση email σας δεν θα δημοσιευθεί. Τα απαιτούμενα πεδία εμφανίζονται με αστερίσκο" + comment_form_comment_label : "Σχόλιο" + comment_form_md_info : "Το πεδίο υποστηρίζει Markdown." + comment_form_name_label : "Όνομα" + comment_form_email_label : "Διεύθυνση email" + comment_form_website_label : "Ιστοσελίδα (προαιρετικό)" + comment_btn_submit : "Υπόβαλε ένα σχόλιο" + comment_btn_submitted : "Έχει υποβληθεί" + comment_success_msg : "Ευχαριστούμε για το σχόλιό σας! Θα εμφανιστεί στην ιστοσελίδα αφού εγκριθεί." + comment_error_msg : "Λυπούμαστε, παρουσιάστηκε σφάλμα με την υποβολή σας. Παρακαλούμε βεβαιωθείτε ότι έχετε όλα τα απαιτούμενα πεδία συμπληρωμένα και δοκιμάστε ξανά." +gr-GR: + <<: *DEFAULT_GR + +# Swedish +# ------- +sv: &DEFAULT_SV + comments_label : "Lämna en kommentar" + comments_title : "Kommentarer" + comment_form_info : "Din e-post adress kommer inte att publiceras. Obligatoriska fält är markerade." + comment_form_comment_label : "Kommentar" + comment_form_md_info : "Använd Markdown för text-formateringen." + comment_form_name_label : "Namn" + comment_form_email_label : "E-post adress" + comment_form_website_label : "Webdsida (valfritt)" + comment_btn_submit : "Skicka en kommentar" + comment_btn_submitted : "Kommentaren har tagits emot" + comment_success_msg : "Tack för din kommentar! Den kommer att visas på sidan så fort den har godkännts." + comment_error_msg : "Tyvärr det har blivit något fel i en av fälten, se till att du fyller i alla rutor och försök igen." +sv-SE: + <<: *DEFAULT_SV +sv-FI: + <<: *DEFAULT_SV + +# Dutch +# ----- +nl: &DEFAULT_NL + comments_label : "Laat een reactie achter" + comments_title : "Commentaren" + comment_form_info : "Uw e-mailadres wordt niet gepubliceerd. Verplichte velden zijn gemarkeerd" + comment_form_comment_label : "Commentaar" + comment_form_md_info : "Markdown wordt ondersteund." + comment_form_name_label : "Naam" + comment_form_email_label : "E-mailadres" + comment_form_website_label : "Website (optioneel)" + comment_btn_submit : "Commentaar toevoegen" + comment_btn_submitted : "Toegevoegd" + comment_success_msg : "Bedankt voor uw reactie! Het zal op de site worden weergegeven zodra het is goedgekeurd." + comment_error_msg : "Sorry, er is een fout opgetreden bij uw inzending. Zorg ervoor dat alle vereiste velden zijn voltooid en probeer het opnieuw." +nl-BE: + <<: *DEFAULT_NL +nl-NL: + <<: *DEFAULT_NL + +# Indonesian +# ---------- +id: &DEFAULT_ID + comments_label : "Tinggalkan komentar" + comments_title : "Komentar" + comment_form_info : "Email Anda tidak akan dipublish. Kolom yang diperlukan ditandai" + comment_form_comment_label : "Komentar" + comment_form_md_info : "Markdown disupport." + comment_form_name_label : "Nama" + comment_form_email_label : "Alamat email" + comment_form_website_label : "Website (opsional)" + comment_btn_submit : "Submit Komentar" + comment_btn_submitted : "Telah disubmit" + comment_success_msg : "Terimakasih atas komentar Anda! Komentar ini akan tampil setelah disetujui." + comment_error_msg : "Maaf, ada kesalahan pada submisi Anda. Pastikan seluruh kolom sudah dilengkapi dan coba kembali." +id-ID: + <<: *DEFAULT_ID + +# Vietnamese +# ---------- +vi: &DEFAULT_VI + comments_label : "Để lại bình luận" + comments_title : "Bình luận" + comment_form_info : "Email của bạn sẽ được giữ bí mật. Các phần bắt buộc được đánh dấu." + comment_form_comment_label : "Bình luận" + comment_form_md_info : "Hỗ trợ Markdown." + comment_form_name_label : "Tên" + comment_form_email_label : "Địa chỉ email" + comment_form_website_label : "Website (không bắt buộc)" + comment_btn_submit : "Gửi bình luận" + comment_btn_submitted : "Đã được gửi" + comment_success_msg : "Cảm ơn bạn đã bình luận! Bình luận sẽ xuất hiện sau khi được duyệt." + comment_error_msg : "Rất tiếc, có lỗi trong việc gửi bình luận. Hãy đảm bảo toàn bộ các phần bắt buộc đã được điền đầy đủ và thử lại." +vi-VN: + <<: *DEFAULT_VI + +# Danish +# ------ +da: &DEFAULT_DA + comments_label : "Skriv en kommentar" + comments_title : "Kommentarer" + comment_form_info : "Din e-mail bliver ikke offentliggjort. Obligatoriske felter er markeret" + comment_form_comment_label : "Kommentar" + comment_form_md_info : "Markdown er understøttet." + comment_form_name_label : "Navn" + comment_form_email_label : "E-mail" + comment_form_website_label : "Website (frivillig)" + comment_btn_submit : "Send kommentar" + comment_btn_submitted : "Sendt" + comment_success_msg : "Tak for din kommentar! Den bliver vist på siden, så snart den er godkendt." + comment_error_msg : "Desværre skete der en fejl. Prøv igen, mens du sørger for at alle obligatoriske felter er udfyldt." +da-DK: + <<: *DEFAULT_DA + +# Polish +# ------ +pl: &DEFAULT_PL + comments_label : "Zostaw komentarz" + comments_title : "Komentarze" + comment_form_info : "Twój adres email nie będzie udostępiony. Wymagane pola są oznaczone." + comment_form_comment_label : "Skomentuj" + comment_form_md_info : "Markdown jest wspierany" + comment_form_name_label : "Imię" + comment_form_email_label : "Adres email" + comment_form_website_label : "Strona www (opcjonalna)" + comment_btn_submit : "Skomentuj" + comment_btn_submitted : "Komentarz dodany" + comment_success_msg : "Dziękuję za Twój komentarz! Zostanie dodany po akceptacji." + comment_error_msg : "Niestety wystąpił błąd. Proszę upewnij się, że wszystkie wymagane pola zostały wypełnione i spróbuj ponownie." +pl-PL: + <<: *DEFAULT_PL + +# Japanese +# -------- +ja: &DEFAULT_JA + comments_label : "コメントする" + comments_title : "コメント" + comment_form_info : "メールアドレスが公開されることはありません。次の印のある項目は必ず入力してください:" + comment_form_comment_label : "コメント" + comment_form_md_info : "Markdown を使用できます" + comment_form_name_label : "名前" + comment_form_email_label : "メールアドレス" + comment_form_website_label : "URL (任意)" + comment_btn_submit : "コメントを送信する" + comment_btn_submitted : "送信しました" + comment_success_msg : "コメントありがとうございます！　コメントは承認されるとページに表示されます。" + comment_error_msg : "送信エラーです。必須項目がすべて入力されていることを確認して再送信してください。" +ja-JP: + <<: *DEFAULT_JA + +# Slovak +# ----------------- +sk: &DEFAULT_SK + comments_label : "Zanechaj odkaz" + comments_title : "Komentáre" + comment_form_info : "Tvoja emailová adresa nebude publikovaná. Požadované polia sú označené" + comment_form_comment_label : "Komentár" + comment_form_md_info : "Markdown je podporovaný." + comment_form_name_label : "Meno" + comment_form_email_label : "Emailová adresa" + comment_form_website_label : "Webstránka (voliteľné)" + comment_btn_submit : "Vlož komentár" + comment_btn_submitted : "Vložený" + comment_success_msg : "Ďakujem za tvoj komentár! Po schválení bude zobrazený na stránke." + comment_error_msg : "Prepáč, pri ukladaní nastala chyba. Ubezpeč sa prosím, že si vyplnil všetky požadované polia a skús znova." +sk-SK: + <<: *DEFAULT_SK + +# Hungarian +# ----------------- +hu: &DEFAULT_HU + comments_label : "Szólj hozzá!" + comments_title : "Hozzászólások" + comment_form_info : "Az e-mail címed nem lesz publikus. A csillagozott mezők kitöltése kötelező." + comment_form_comment_label : "Hozzászólás" + comment_form_md_info : "Támogatott formázási mód: Markdown" + comment_form_name_label : "Név" + comment_form_email_label : "Email cím" + comment_form_website_label : "Honlap (nem kötelező):" + comment_btn_submit : "Hozzászólás elküldése" + comment_btn_submitted : "Hozzászólás elküldve" + comment_success_msg : "Köszönjük a Hozzászólást! A Hozzászólások csak előzetes moderáció után lesznek publikusak." + comment_error_msg : "Hoppá, hiba történt a beküldés közben. Kérlek ellenőrizd hogy minden kötelező mező ki van-e töltve." +hu-HU: + <<: *DEFAULT_HU + +# Romanian +# ----------------- +ro: &DEFAULT_RO + comments_label : "Lasă un comentariu" + comments_title : "Comentarii" + comment_form_info : "Adresa ta de email nu va fi făcută publică. Câmpurile marcate sunt obligatorii" + comment_form_comment_label : "Comentariu" + comment_form_md_info : "Markdown este suportat." + comment_form_name_label : "Nume" + comment_form_email_label : "Adresă de email" + comment_form_website_label : "Site (opțional)" + comment_btn_submit : "Trimite comentariul" + comment_btn_submitted : "Trimis" + comment_success_msg : "Mulțumesc pentru comentariu! Va apărea pe site în momentul în care va fi aprobat." + comment_error_msg : "Scuze, este o problemă cu comentariul tău. Asigură-te că toate câmpurile obligatorii au fost completate și încearcă din nou." +ro-RO: + <<: *DEFAULT_RO + +# Punjabi +# ----------------- +pa: &DEFAULT_PA + comments_label : "ਇੱਕ ਟਿੱਪਣੀ ਛੱਡੋ" + comments_title : "ਟਿੱਪਣੀਆਂ" + comment_form_info : "ਤੁਹਾਡਾ ਈਮੇਲ ਪਤਾ ਪ੍ਰਕਾਸ਼ਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਅਨੁਮਾਨਿਤ ਸਥਾਨਾਂ ਨੂੰ ਅੰਡਰਲਾਈਨ ਕੀਤਾ ਗਿਆ ਹੈ" + comment_form_comment_label : "ਟਿੱਪਣੀ" + comment_form_md_info : "ਮਾਰਕਡਾਊਨ ਵਰਤ ਸਕਦੇ ਹੋ।" + comment_form_name_label : "ਨਾਮ" + comment_form_email_label : "ਈਮੇਲ ਪਤਾ" + comment_form_website_label : "ਵੈਬਸਾਈਟ (ਵਿਕਲਪਿਕ)" + comment_btn_submit : "ਕੋਈ ਟਿੱਪਣੀ ਭੇਜੋ" + comment_btn_submitted : "ਪੇਸ਼ ਕੀਤਾ" + comment_success_msg : "ਤੁਹਾਡੀਆਂ ਟਿੱਪਣੀਆਂ ਲਈ ਧੰਨਵਾਦ! ਇਹ ਮਨਜ਼ੂਰੀ ਮਿਲਣ ਦੇ ਬਾਅਦ ਸਾਈਟ 'ਤੇ ਦਿਖਾਇਆ ਜਾਵੇਗਾ।" + comment_error_msg : "ਮੁਆਫ ਕਰਨਾ, ਤੁਹਾਡੀ ਅਧੀਨਗੀ ਵਿੱਚ ਕੋਈ ਗਲਤੀ ਹੋਈ ਸੀ ਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਸਾਰੇ ਲੋੜੀਂਦੇ ਖੇਤਰ ਪੂਰੇ ਹੋ ਗਏ ਹਨ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" +pa-IN: + <<: *DEFAULT_PA + +# Another locale +# -------------- +# diff --git a/_includes/disqus.html b/_includes/disqus.html index fd05ba0c4395..dd80975cbab0 100644 --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -1,17 +1,17 @@ -{% if site.disqus %} +{%- if site.disqus -%}
-
- - + var disqus_url = url_parts[0]; + (function() { + var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; + dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); + +
-{% endif %} +{%- endif -%} diff --git a/_includes/ext-css.html b/_includes/ext-css.html index 9e2f52206138..3becb23328b8 100644 --- a/_includes/ext-css.html +++ b/_includes/ext-css.html @@ -4,4 +4,4 @@ {% else %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/fb-comment.html b/_includes/fb-comment.html new file mode 100644 index 000000000000..8b47a2b6efbb --- /dev/null +++ b/_includes/fb-comment.html @@ -0,0 +1,14 @@ +{%- if site.fb_comment_id -%} +
+
+ +
+ +
+{%- endif -%} diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html index 5ad0cb1242b0..537e9cc890d6 100644 --- a/_includes/footer-scripts.html +++ b/_includes/footer-scripts.html @@ -30,5 +30,3 @@ {% endif %} {% endfor %} {% endif %} - -{% include google_analytics.html %} diff --git a/_includes/footer.html b/_includes/footer.html index 220012e75ab4..c5bf72e5f39a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,189 +3,50 @@

- UoY logo -
- {{ site.author.name }} -  •  - {{ site.time | date: '%Y' }} + UoY logo +
+ {{ site.author.name }} +  •  + {{ site.time | date: '%Y' }} + + {% if site.url-pretty %} +  •  + {{ site.url-pretty }} + {% endif %} - {% if site.url-pretty %} -  •  - {{ site.url-pretty }} - {% endif %} -

- -

- Theme by - beautiful-jekyll -

+ {% if site.matomo %} + {% if site.matomo.opt-out %} +  •  + Do-not-Track + {% endif %} + {% endif%} +

+ +

+ Theme by + beautiful-jekyll +

diff --git a/_includes/google_analytics.html b/_includes/google_analytics.html index eb9b7ddbb2e5..18bd05b859c9 100644 --- a/_includes/google_analytics.html +++ b/_includes/google_analytics.html @@ -1,12 +1,14 @@ {% if site.google_analytics %} - - - -{% endif %} \ No newline at end of file + + + +{% endif %} diff --git a/_includes/gtag.html b/_includes/gtag.html new file mode 100644 index 000000000000..a7f498829629 --- /dev/null +++ b/_includes/gtag.html @@ -0,0 +1,11 @@ +{% if site.gtag %} + + + +{% endif %} diff --git a/_includes/gtm_body.html b/_includes/gtm_body.html index 0d9ae022c7e4..7999512d9e80 100644 --- a/_includes/gtm_body.html +++ b/_includes/gtm_body.html @@ -3,4 +3,4 @@ -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/gtm_head.html b/_includes/gtm_head.html index ded5d417c0ed..f630f3e87282 100644 --- a/_includes/gtm_head.html +++ b/_includes/gtm_head.html @@ -6,4 +6,4 @@ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{{ site.gtm }}'); -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/head.html b/_includes/head.html index fad8f4b5e0a0..1242dd0c71fe 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,7 +1,7 @@ - + {% if page.use-site-title %}{{ site.title }} {{ site.title-separator }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} @@ -13,7 +13,9 @@ + {% include gtag.html %} {% include gtm_head.html %} + {% include google_analytics.html %} {% if layout.common-ext-css %} {% for css in layout.common-ext-css %} @@ -88,7 +90,7 @@ {% elsif site.avatar %} {% endif %} - + @@ -117,4 +119,13 @@ {% endif %} + {% if site.matomo %} + {% include matomo.html %} + {% endif %} + + {% if page.comments and site.staticman.repository and site.staticman.branch %} + + + {% endif %} + diff --git a/_includes/just_comments.html b/_includes/just_comments.html new file mode 100644 index 000000000000..adbf9891807c --- /dev/null +++ b/_includes/just_comments.html @@ -0,0 +1,4 @@ +{%- if site.just-comments -%} +
+ +{%- endif -%} diff --git a/_includes/matomo.html b/_includes/matomo.html new file mode 100644 index 000000000000..e53a3eff151a --- /dev/null +++ b/_includes/matomo.html @@ -0,0 +1,17 @@ +{% if site.matomo %} + + + +{% endif %} diff --git a/_includes/nav.html b/_includes/nav.html index 3c7626737a05..3d7853b08702 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -50,7 +50,7 @@ {% if page.image and (layout.show-avatar or page.show-avatar) %}
- +
@@ -58,7 +58,7 @@ {% elsif site.avatar and (layout.show-avatar or page.show-avatar) %}
- +
diff --git a/_includes/navbarlink.html b/_includes/navbarlink.html index 5a94a2df77dc..f264618899c5 100644 --- a/_includes/navbarlink.html +++ b/_includes/navbarlink.html @@ -1,10 +1,10 @@ {% capture before %}{{ include.link[1] | split: "://" | first }}{% endcapture %} -{% capture after %}{{ include.link[1] | split: "://" | last }}{% endcapture %} +{% capture after %}{{ include.link[1] | split: "://" | last }}{% endcapture %} {% assign internal = true %} {% if before != after %} {% if before == "http" or before == "https" %} {% assign internal = false %} - {% endif %} + {% endif %} {% endif %} {% if internal %} diff --git a/_includes/staticman-comment.html b/_includes/staticman-comment.html new file mode 100644 index 000000000000..0e7728fb3bba --- /dev/null +++ b/_includes/staticman-comment.html @@ -0,0 +1,22 @@ + diff --git a/_includes/staticman-comments.html b/_includes/staticman-comments.html new file mode 100644 index 000000000000..83f5c30ec20a --- /dev/null +++ b/_includes/staticman-comments.html @@ -0,0 +1,72 @@ +{% if site.staticman.repository and site.staticman.branch %} +
+ +
+ {% if site.data.comments[page.slug] %} +

{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}

+ {% assign comments = site.data.comments[page.slug] | sort %} + {% for comment in comments %} + {% assign email = comment[1].email %} + {% assign name = comment[1].name %} + {% assign url = comment[1].url %} + {% assign date = comment[1].date %} + {% assign message = comment[1].message %} + {% include staticman-comment.html index=forloop.index email=email name=name url=url date=date message=message %} + {% endfor %} + {% endif %} +
+ + +
+

{{ site.data.ui-text[site.locale].comments_label | default: "Leave a Comment" }}

+

{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} *

+
+
+
+ +
{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}
+
+
+ + +
+
+ + +
+
+ + +
+ + + + + {% if site.staticman.reCaptcha.siteKey %} +
+
+
+ {% endif %} +
+ +
+
+
+ + + {% if site.staticman.reCaptcha.siteKey %} + + {% endif %} +
+ + {% include staticman-script.html %} +{% endif %} diff --git a/_includes/staticman-script.html b/_includes/staticman-script.html new file mode 100644 index 000000000000..d71da446041f --- /dev/null +++ b/_includes/staticman-script.html @@ -0,0 +1,47 @@ +{% if site.staticman.repository and site.staticman.branch %} + + + +{% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index 919ec8ea8347..1c457bf38e22 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,4 +6,4 @@
{{ content }} -
\ No newline at end of file +
diff --git a/_layouts/minimal.html b/_layouts/minimal.html index 40f06e0a69f8..a2311c319a04 100644 --- a/_layouts/minimal.html +++ b/_layouts/minimal.html @@ -19,8 +19,8 @@
{% include footer-minimal.html %} - + {% include footer-scripts.html %} - + diff --git a/_layouts/page.html b/_layouts/page.html index 38286a216564..b22231cbc02a 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -11,6 +11,13 @@ {% if page.comments %}
{% include disqus.html %} +
+ {% include fb-comment.html %} +
+ {% include staticman-comments.html %} +
+
+ {% include just_comments.html %}
{% endif %} diff --git a/_layouts/post.html b/_layouts/post.html index bd3c20ceb2db..88bca9cdefe5 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -8,6 +8,29 @@
+ {% if page.gh-repo %} + {% assign gh_split = page.gh-repo | split:'/' %} + {% assign gh_user = gh_split[0] %} + {% assign gh_repo = gh_split[1] %} + +
+ {% if page.gh-badge.size > 0 %} + {% for badge in page.gh-badge %} + {% case badge %} + {% when 'star'%} + + {% when 'watch'%} + + {% when 'fork'%} + + {% when 'follow'%} + + {% endcase %} + {% endfor %} + {% endif %} +
+ {% endif %} +
{{ content }}
@@ -17,7 +40,7 @@ Tags: {% if site.link-tags %} {% for tag in page.tags %} - {{ tag }} + {{- tag -}} {% endfor %} {% else %} {{ page.tags | join: ", " }} @@ -46,7 +69,14 @@
{% include disqus.html %}
+ {% include fb-comment.html %} +
+ {% include staticman-comments.html %} +
+
+ {% include just_comments.html %} +
{% endif %}
- \ No newline at end of file + diff --git a/_layouts/tag_index.html b/_layouts/tag_index.html deleted file mode 100644 index 0bfaa9f96f77..000000000000 --- a/_layouts/tag_index.html +++ /dev/null @@ -1,41 +0,0 @@ ---- -layout: default ---- - -

{{page.title}}:

- -
- {% for post in site.posts %} - {% for tag in post.tags %} - {% if tag == page.tag %} - - {% endif %} - {% endfor %} - {% endfor %} -
diff --git a/_plugins/_tag_gen.rb b/_plugins/_tag_gen.rb deleted file mode 100644 index 67eeb2a6c9b5..000000000000 --- a/_plugins/_tag_gen.rb +++ /dev/null @@ -1,33 +0,0 @@ -module Jekyll - class TagIndex < Page - def initialize(site, base, dir, tag) - @site = site - @base = base - @dir = dir - @name = 'index.html' - self.process(@name) - self.read_yaml(File.join(base, '_layouts'), 'tag_index.html') - self.data['tag'] = tag - tag_title_prefix = site.config['tag_title_prefix'] || 'Posts Tagged “' - tag_title_suffix = site.config['tag_title_suffix'] || '”' - self.data['title'] = "#{tag_title_prefix}#{tag}#{tag_title_suffix}" - end - end - class TagGenerator < Generator - safe true - def generate(site) - if site.layouts.key? 'tag_index' - dir = site.config['tag_dir'] || 'tag' - site.tags.keys.each do |tag| - write_tag_index(site, File.join(dir, tag), tag) - end - end - end - def write_tag_index(site, dir, tag) - index = TagIndex.new(site, site.source, dir, tag) - index.render(site.layouts, site.site_payload) - index.write(site.dest) - site.pages << index - end - end -end diff --git a/css/main.css b/css/main.css index d4480d64f5c8..059c7691c1db 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,7 @@ +--- +layout: null +--- + @import url("pygment_highlights.css"); /* --- General --- */ @@ -7,26 +11,26 @@ body { font-size: 18px; color: #404040; position: relative; - background: #FFF; + background-color: {{ site.page-col }}; + {% if site.page-img %} + background-image: url({{ site.page-img }}); + background-attachment: fixed; + {% endif %} } p { line-height: 1.5; margin: 30px 0; } -p a { - /* text-decoration: underline */ - color: #008AFF; -} h1,h2,h3,h4,h5,h6 { font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 800; } a { - color: #008AFF; + color: {{ site.link-col }}; } a:hover, a:focus { - color: #0085a1; + color: {{ site.hover-col }}; } blockquote { color: #808080; @@ -48,6 +52,8 @@ hr.small { } @media only screen and (min-width: 768px) { .main-content { + padding-left: env(safe-area-inset-left); + padding-right: env(safe-area-inset-right); padding-top: 130px; } } @@ -64,12 +70,12 @@ hr.small { ::-moz-selection { color: white; text-shadow: none; - background: #0085a1; + background-color: {{ site.hover-col }}; } ::selection { color: white; text-shadow: none; - background: #0085a1; + background-color: {{ site.hover-col }}; } img::selection { color: white; @@ -94,12 +100,21 @@ img { } } +.linked-section { + padding-top: 60px; + margin-top: -25px; +} + /* --- Navbar --- */ .navbar-custom { - background: #F5F5F5; + background-color: {{ site.navbar-col }}; border-bottom: 1px solid #EAEAEA; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + {% if site.navbar-img %} + background-image: url({{ site.navbar-img }}); + background-attachment: fixed; + {% endif %} } .navbar-custom .nav li a { @@ -111,14 +126,14 @@ img { .navbar-custom .navbar-brand, .navbar-custom .nav li a { font-weight: 800; - color: #404040; + color: {{ site.navbar-text-col }}; } .navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:focus , .navbar-custom .nav li a:hover, .navbar-custom .nav li a:focus { - color: #0085a1; + color: {{ site.hover-col }}; } .navbar-custom .navbar-brand-logo { @@ -154,11 +169,7 @@ img { } .navbar-custom .avatar-container { - opacity: 1; position: absolute; - -webkit-transition: opacity 0.5s ease-in-out; - -moz-transition: opacity 0.5s ease-in-out; - transition: opacity 0.5s ease-in-out; left: 50%; width: 50px; margin-top: -25px; @@ -178,10 +189,6 @@ img { display: block; } -.navbar-custom.top-nav-short .avatar-container{ - opacity: 0; -} - .navbar-custom.top-nav-expanded .avatar-container { display: none; } @@ -204,6 +211,11 @@ img { } } +.container-fluid { + padding-left: max(15px, env(safe-area-inset-left)); + padding-right: max(15px, env(safe-area-inset-right)); +} + /* Multi-level navigation links */ .navbar-custom .nav .navlinks-container { position: relative; @@ -220,14 +232,14 @@ img { display: block; padding: 10px; padding-left: 30px; - background: #f5f5f5; + background-color: {{ site.navbar-children-col }}; text-decoration: none !important; border-width: 0 1px 1px 1px; font-weight: normal; } @media only screen and (max-width: 767px) { .navbar-custom .nav .navlinks-container.show-children { - background: #eee; + background: rgba(0, 0, 0, 0.2); } .navbar-custom .nav .navlinks-container.show-children .navlinks-children { display: block; @@ -238,7 +250,7 @@ img { text-align: center; } .navbar-custom .nav .navlinks-container:hover { - background: #eee; + background: rgba(0, 0, 0, 0.1); } .navbar-custom .nav .navlinks-container:hover .navlinks-children { display: block; @@ -257,14 +269,22 @@ img { footer { padding: 30px 0; - background: #F5F5F5; border-top: 1px #EAEAEA solid; margin-top: 50px; font-size: 14px; + background-color: {{ site.footer-col }}; + {% if site.footer-img %} + background-image: url({{ site.footer-img }}); + background-attachment: fixed; + {% endif %} +} + +footer p.text-muted { + color: {{ site.footer-text-col }}; } footer a { - color: #404040; + color: {{site.footer-link-col}}; } footer .list-inline { @@ -318,7 +338,7 @@ footer .theme-by { .post-preview a:focus, .post-preview a:hover { text-decoration: none; - color: #0085a1; + color: {{ site.hover-col }}; } .post-preview .post-title { @@ -382,15 +402,15 @@ footer .theme-by { } .blog-tags a { - color: #008AFF; + color: {{ site.link-col }}; text-decoration: none; padding: 0px 5px; } .blog-tags a:hover { border-radius: 2px; - color: #008AFF; - background-color: #CCC; + color: {{ site.hover-col }}; + background-color: #EEE; } .post-preview .blog-tags { @@ -522,7 +542,7 @@ footer .theme-by { .header-section.has-img .no-img { margin-top: 0; - background: #FCFCFC; + background-color: #FCFCFC; margin: 0 0 40px; padding: 20px 0; box-shadow: 0 0 5px #AAA; @@ -564,6 +584,16 @@ footer .theme-by { border-bottom-left-radius: 5px; } +#header-gh-btns { + margin-bottom: 15px; +} +@media only screen and (max-width: 500px) { + #header-gh-btns > iframe { + display: block; + margin-bottom: 5px; + } +} + /* --- Pager --- */ .pager li a { @@ -573,7 +603,7 @@ footer .theme-by { font-weight: 800; letter-spacing: 1px; padding: 10px 5px; - background: #FFF; + background-color: #FFF; border-radius: 0; color: #404040; } @@ -585,8 +615,8 @@ footer .theme-by { .pager li a:hover, .pager li a:focus { color: #FFF; - background: #0085a1; - border: 1px solid #0085a1; + border: 1px solid {{ site.hover-col }}; + background-color: {{ site.hover-col }}; } .pager { @@ -649,7 +679,7 @@ pre code { white-space: pre; } pre.highlight, .highlight > pre, td.code pre { - background: #FAFAFA; + background-color: #FAFAFA; background-image: linear-gradient(#F9F9F9 50%, #FDFDFD 50%); background-repeat: repeat; background-size: 3em 3em; @@ -665,6 +695,9 @@ td.gutter pre { .highlight > pre { padding: 0; } +.highlight > pre.highlight { + padding: 9.5px; +} td.code pre { border-width: 0 0 0 2px; border-style: solid; @@ -680,3 +713,77 @@ td.gutter { #social-share-section { margin-bottom: 30px; } + +/* --- Notification boxes --- */ +.box-note, .box-warning, .box-error, .box-success { + padding: 15px 15px 15px 10px; + margin: 20px 20px 20px 5px; + border: 1px solid #eee; + border-left-width: 5px; + border-radius: 5px 3px 3px 5px; +} + +.box-note { + background-color: #eee; + border-left-color: #2980b9; +} + +.box-warning { + background-color: #fdf5d4; + border-left-color: #f1c40f; +} + +.box-error { + background-color: #f4dddb; + border-left-color: #c0392b; +} + +.box-success { + background-color: #98FB98; + border-left-color: #3CB371; +} + +/* Fix table border github gist snippets */ + +.gist, .gist-file table tr { + border: unset; +} + +.gist, .gist-file table tr td { + border: unset; +} + +/* Fix .navbar-toggle */ + +.navbar-default button.navbar-toggle:focus, +.navbar-default button.navbar-toggle:hover { + background-color: initial; +} + +.navbar-default button.navbar-toggle[aria-expanded="true"] { + background-color: rgba(0, 0, 0, 0.2); +} + +/* Tags page */ + +.tag-btn { + margin: 5px; +} + +#full-tags-list { + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; +} + +#full-tags-list .tag-entry { + margin: 0 0 15px 25px; +} + +#full-tags-list .tag-entry a { + font-size: 20px; +} + +#full-tags-list .tag-entry .entry-date { + color: #808080; + font-style: italic; + font-size: 16px; +} diff --git a/css/normalize.css b/css/normalize.css index 81c6f31ea4b8..458eea1ea3d5 100644 --- a/css/normalize.css +++ b/css/normalize.css @@ -424,4 +424,4 @@ table { td, th { padding: 0; -} \ No newline at end of file +} diff --git a/css/pygment_highlights.css b/css/pygment_highlights.css index 411bfeb818a0..da52862a7e18 100644 --- a/css/pygment_highlights.css +++ b/css/pygment_highlights.css @@ -61,6 +61,6 @@ .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;} +.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 */ diff --git a/css/staticman.css b/css/staticman.css new file mode 100644 index 000000000000..37715953d159 --- /dev/null +++ b/css/staticman.css @@ -0,0 +1,187 @@ +/* ========================================================================== + Forms + ========================================================================== */ +.staticman-comments form { + margin: 0 0 5px 0; + padding: 1em; + background-color: #f2f3f3; +} +.staticman-comments form p { + margin-bottom: 2.5px; +} +.staticman-comments form br { + display: none; +} +.staticman-comments label, .staticman-comments input, .staticman-comments button, .staticman-comments textarea { + vertical-align: baseline; + vertical-align: middle; +} +.staticman-comments input, .staticman-comments button, .staticman-comments textarea { + box-sizing: border-box; +} +.staticman-comments label { + display: block; + margin-bottom: 0.25em; + color: #494e52; + cursor: pointer; +} +.staticman-comments label small { + font-size: 0.75em; +} +.staticman-comments label input, .staticman-comments label textarea { + display: block; +} +.staticman-comments input, .staticman-comments textarea { + display: inline-block; + width: 100%; + padding: 0.25em; + margin-bottom: 0.5em; + color: #494e52; + background-color: #fff; + border: #f2f3f3; + border-radius: 4px; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.125); +} +.staticman-comments .input-mini { + width: 60px; +} +.staticman-comments .input-small { + width: 90px; +} +.staticman-comments input[type="button"], .staticman-comments input[type="reset"], .staticman-comments input[type="submit"] { + width: auto; + height: auto; + cursor: pointer; + overflow: visible; +} +.staticman-comments textarea { + resize: vertical; + height: auto; + overflow: auto; + vertical-align: top; +} +.staticman-comments input[type="hidden"] { + display: none; +} +.staticman-comments .form { + position: relative; +} +/* + Disabled state + ========================================================================== */ +.staticman-comments input[disabled][disabled], .staticman-comments textarea[disabled], .staticman-comments input[readonly][readonly], .staticman-comments textarea[readonly] { + opacity: 0.5; + cursor: not-allowed; +} +/* + Focus & active state + ========================================================================== */ +.staticman-comments input:focus, .staticman-comments textarea:focus { + border-color: #7a8288; + outline: 0; + outline: thin dotted \9; + box-shadow: inset 0 1px 3px rgba(73, 78, 82, 0.06), 0 0 5px rgba(122, 130, 136, 0.7); +} +.staticman-comments input[type="file"]:focus, .staticman-comments input[type="radio"]:focus, .staticman-comments input[type="checkbox"]:focus:focus { + box-shadow: none; +} +/* + Help text + ========================================================================== */ +.staticman-comments .help-block { + color: #898c8e; +} +.staticman-comments .help-block { + display: block; + margin-bottom: 1em; + line-height: 1em; +} +/* + .form-group + ========================================================================== */ +.staticman-comments .form-group { + margin-bottom: 5px; + padding: 0; + border-width: 0; +} +/* + Comments + ========================================================================== */ +.staticman-comments .page__comments { + float: left; + margin-left: 0; + margin-right: 0; + width: 100%; + clear: both; +} +.staticman-comments .page__comments-title { + margin-top: 2rem; + margin-bottom: 10px; + padding-top: 2rem; + border-top: 1px solid #f2f3f3; +} +.staticman-comments .page__comments-form { + -webkit-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.staticman-comments .page__comments-form.disabled input, .staticman-comments .page__comments-form.disabled button, .staticman-comments .page__comments-form.disabled textarea, .staticman-comments .page__comments-form.disabled label { + pointer-events: none; + cursor: not-allowed; + filter: alpha(opacity=65); + box-shadow: none; + opacity: 0.65; +} +.staticman-comments .comment { + margin: 1em 0; +} +.staticman-comments .comment:not(:last-child) { + border-bottom: 1px solid #f2f3f3; +} +.staticman-comments .comment__avatar-wrapper { + float: left; + width: 60px; + height: 60px; +} +.staticman-comments .comment__avatar { + width: 40px; + height: 40px; + border-radius: 50%; +} +.staticman-comments .comment__content-wrapper { + width: calc(100% - 60px); +} +.staticman-comments .comment__author { + margin: 0; +} +.staticman-comments .comment__author a { + text-decoration: none; +} +.staticman-comments .comment__date { + margin: 0; +} +.staticman-comments .comment__date a { + text-decoration: none; +} +/* ========================================================================== + PRINT STYLES + ========================================================================== */ +.staticman-comments @media print { + /* + Hide the following elements on print + ========================================================================== */ +.staticman-comments [hidden] { + display: none; + } +.staticman-comments .masthead, .staticman-comments .toc, .staticman-comments .page__share, .staticman-comments .page__related, .staticman-comments .pagination, .staticman-comments .ads, .staticman-comments .page__footer, .staticman-comments .page__comments-form, .staticman-comments .author__avatar, .staticman-comments .author__content, .staticman-comments .author__urls-wrapper, .staticman-comments .nav__list, .staticman-comments .sidebar, .staticman-comments .adsbygoogle { + display: none !important; + height: 1px !important; + } +} +/* + Post pagination navigation links + ========================================================================== */ +.staticman-comments .page__comments + .staticman-comments .pagination { + margin-top: 2em; + padding-top: 2em; + border-top: 1px solid #f2f3f3; +} diff --git a/img/bgimage.png b/img/bgimage.png new file mode 100644 index 000000000000..9e2d35969fa8 Binary files /dev/null and b/img/bgimage.png differ diff --git a/index.html b/index.html index 69f5402745dd..fc205277e93b 100644 --- a/index.html +++ b/index.html @@ -44,7 +44,7 @@

Tags: {% if site.link-tags %} {% for tag in post.tags %} - {{ tag }} + {{- tag -}} {% endfor %} {% else %} {{ post.tags | join: ", " }} diff --git a/js/main.js b/js/main.js index 97b159e3d0a2..fbf46aee2f52 100644 --- a/js/main.js +++ b/js/main.js @@ -10,11 +10,13 @@ var main = { $(window).scroll(function() { if ($(".navbar").offset().top > 50) { $(".navbar").addClass("top-nav-short"); + $(".navbar-custom .avatar-container").fadeOut(500); } else { $(".navbar").removeClass("top-nav-short"); + $(".navbar-custom .avatar-container").fadeIn(500); } }); - + // On mobile, hide the avatar when expanding the navbar menu $('#main-navbar').on('show.bs.collapse', function () { $(".navbar").addClass("top-nav-expanded"); @@ -22,7 +24,7 @@ var main = { $('#main-navbar').on('hidden.bs.collapse', function () { $(".navbar").removeClass("top-nav-expanded"); }); - + // On mobile, when clicking on a multi-level navbar menu, show the child links $('#main-navbar').on("click", ".navlinks-parent", function(e) { var target = e.target; @@ -34,7 +36,7 @@ var main = { } }); }); - + // Ensure nested navbar menus are not longer than the menu header var menus = $(".navlinks-container"); if (menus.length > 0) { @@ -60,12 +62,12 @@ var main = { }); fakeMenu.remove(); - } - - // show the big header image + } + + // show the big header image main.initImgs(); }, - + initImgs : function() { // If the page was large images to randomly select from, choose an image if ($("#header-big-imgs").length > 0) { @@ -78,57 +80,57 @@ var main = { var src = imgInfo.src; var desc = imgInfo.desc; main.setImg(src, desc); - + // For better UX, prefetch the next image so that it will already be loaded when we want to show it var getNextImg = function() { var imgInfo = main.getImgInfo(); var src = imgInfo.src; - var desc = imgInfo.desc; - + var desc = imgInfo.desc; + var prefetchImg = new Image(); prefetchImg.src = src; // if I want to do something once the image is ready: `prefetchImg.onload = function(){}` - + setTimeout(function(){ var img = $("
").addClass("big-img-transition").css("background-image", 'url(' + src + ')'); $(".intro-header.big-img").prepend(img); setTimeout(function(){ img.css("opacity", "1"); }, 50); - + // after the animation of fading in the new image is done, prefetch the next one //img.one("transitioned webkitTransitionEnd oTransitionEnd MSTransitionEnd", function(){ setTimeout(function() { main.setImg(src, desc); img.remove(); getNextImg(); - }, 1000); - //}); + }, 1000); + //}); }, 6000); }; - + // If there are multiple images, cycle through them if (main.numImgs > 1) { getNextImg(); } } }, - + getImgInfo : function() { var randNum = Math.floor((Math.random() * main.numImgs) + 1); var src = main.bigImgEl.attr("data-img-src-" + randNum); var desc = main.bigImgEl.attr("data-img-desc-" + randNum); - + return { src : src, desc : desc } }, - + setImg : function(src, desc) { $(".intro-header.big-img").css("background-image", 'url(' + src + ')'); if (typeof desc !== typeof undefined && desc !== false) { $(".img-desc").text(desc).show(); } else { - $(".img-desc").hide(); + $(".img-desc").hide(); } } }; diff --git a/staticman.yml b/staticman.yml new file mode 100644 index 000000000000..164e97d23779 --- /dev/null +++ b/staticman.yml @@ -0,0 +1,108 @@ +# Name of the property. You can have multiple properties with completely +# different config blocks for different sections of your site. +# For example, you can have one property to handle comment submission and +# 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 + +comments: + # (*) REQUIRED + # + # Names of the fields the form is allowed to submit. If a field that is + # not here is part of the request, an error will be thrown. + allowedFields: ["name", "email", "url", "message"] + + # (*) REQUIRED WHEN USING NOTIFICATIONS + # + # When allowedOrigins is defined, only requests sent from one of the domains + # listed will be accepted. The origin is sent as part as the `options` object + # (e.g.  {{- tag -}} ({{site.tags[tag].size}}) +{%- endfor -%} + +
+{%- for tag in tags_list -%} +

+ +  {{- tag -}} ({{site.tags[tag].size}}) +

+
+ {%- for post in site.tags[tag] -%} +
+ {{- post.title -}} +
+ +
+
+ {%- endfor -%} +
+{%- endfor -%} +