From 5641d7e51ababc05ad3eb8337af1bcb205ddbfed Mon Sep 17 00:00:00 2001 From: lifehackerhansol Date: Sat, 2 Oct 2021 02:28:46 -0700 Subject: [PATCH] first rebase ALSO: Remove fading on dropdown menu click. This is also a bug on the actual upstream, when the cursor leaves the screen the menu disappears but the fading doesn't. This causes things like the menu saying it's open when it's not and closed when open. I'm not dealing with an upstream bug. --- .bundle/config | 3 - .gitattributes | 15 +- .gitignore | 30 +- .vscode/settings.json | 4 - Gemfile | 7 +- LICENSE.txt => LICENSE | 2 +- _config.yml | 284 +- _data/navigation/en_US.yml | 2 +- .../analytics-providers/google-gtag.html | 9 + .../analytics-providers/google-universal.html | 12 +- _includes/analytics-providers/google.html | 7 +- _includes/analytics.html | 4 +- _includes/archive-single.html | 22 +- _includes/author-profile-custom-links.html | 4 +- _includes/author-profile.html | 147 +- _includes/base_path | 5 - _includes/breadcrumbs.html | 8 +- _includes/browser-upgrade.html | 4 +- _includes/category-list.html | 17 +- _includes/comment.html | 6 +- .../comments-providers/custom_scripts.html | 3 + _includes/comments-providers/disqus.html | 6 +- _includes/comments-providers/giscus.html | 24 + _includes/comments-providers/google-plus.html | 2 - _includes/comments-providers/scripts.html | 34 +- _includes/comments-providers/staticman.html | 6 +- .../comments-providers/staticman_v2.html | 40 + _includes/comments-providers/utterances.html | 20 + _includes/comments.html | 243 +- _includes/documents-collection.html | 15 + _includes/feature_row | 21 +- _includes/figure | 17 +- _includes/footer.html | 23 +- _includes/footer/custom.html | 2 +- _includes/gallery | 42 +- _includes/group-by-array | 2 +- _includes/head.html | 34 +- _includes/head/custom.html | 3 +- _includes/masthead.html | 19 +- _includes/nav_list | 2 +- _includes/page__date.html | 6 + _includes/page__hero.html | 46 +- _includes/page__hero_video.html | 6 +- _includes/page__meta.html | 31 + _includes/page__taxonomy.html | 2 +- _includes/paginator.html | 12 +- _includes/post_pagination.html | 6 +- _includes/posts-category.html | 5 + _includes/posts-tag.html | 5 + _includes/read-time.html | 15 - _includes/scripts.html | 27 +- _includes/search/algolia-search-scripts.html | 61 + _includes/search/google-search-scripts.html | 30 + _includes/search/lunr-search-scripts.html | 10 + _includes/search/search_form.html | 26 + _includes/seo.html | 175 +- _includes/sidebar.html | 26 +- _includes/skip-links.html | 7 + _includes/social-share.html | 8 +- _includes/tag-list.html | 17 +- _includes/toc | 2 +- _includes/toc.html | 182 + _includes/video | 27 +- _layouts/archive-taxonomy.html | 16 +- _layouts/archive.html | 4 +- _layouts/categories.html | 43 + _layouts/category.html | 10 + _layouts/collection.html | 10 + _layouts/compress.html | 4 +- _layouts/default.html | 24 +- _layouts/home.html | 17 +- _layouts/posts.html | 30 + _layouts/search.html | 42 + _layouts/single-no-ads.html | 85 - _layouts/single.html | 34 +- _layouts/splash.html | 15 +- _layouts/tag.html | 10 + _layouts/tags.html | 43 + _pages/en_US/404.txt | 1 - _pages/en_US/donations.txt | 1 - _pages/en_US/privacy-policy.txt | 1 - _pages/en_US/site-navigation.txt | 1 - _sass/minimal-mistakes.scss | 10 +- _sass/minimal-mistakes/_archive.scss | 209 +- _sass/minimal-mistakes/_base.scss | 93 +- _sass/minimal-mistakes/_buttons.scss | 9 +- _sass/minimal-mistakes/_footer.scss | 24 +- _sass/minimal-mistakes/_forms.scss | 86 +- _sass/minimal-mistakes/_masthead.scss | 28 +- _sass/minimal-mistakes/_mixins.scss | 4 +- _sass/minimal-mistakes/_navigation.scss | 961 +- _sass/minimal-mistakes/_notices.scss | 20 +- _sass/minimal-mistakes/_page.scss | 162 +- _sass/minimal-mistakes/_reset.scss | 2 +- _sass/minimal-mistakes/_search.scss | 132 + _sass/minimal-mistakes/_sidebar.scss | 129 +- _sass/minimal-mistakes/_syntax.scss | 396 +- _sass/minimal-mistakes/_tables.scss | 16 +- _sass/minimal-mistakes/_utilities.scss | 288 +- _sass/minimal-mistakes/_variables.scss | 214 +- _sass/minimal-mistakes/skins/_air.scss | 4 +- _sass/minimal-mistakes/skins/_aqua.scss | 34 + _sass/minimal-mistakes/skins/_contrast.scss | 24 +- _sass/minimal-mistakes/skins/_dark.scss | 12 +- _sass/minimal-mistakes/skins/_dirt.scss | 20 +- _sass/minimal-mistakes/skins/_mint.scss | 5 +- _sass/minimal-mistakes/skins/_neon.scss | 63 + _sass/minimal-mistakes/skins/_plum.scss | 70 + _sass/minimal-mistakes/skins/_sunrise.scss | 29 +- .../vendor/font-awesome/_animated.scss | 34 - .../vendor/font-awesome/_bordered-pulled.scss | 25 - .../vendor/font-awesome/_core.scss | 12 - .../vendor/font-awesome/_fixed-width.scss | 6 - .../vendor/font-awesome/_font-awesome.scss | 18 - .../vendor/font-awesome/_icons.scss | 789 -- .../vendor/font-awesome/_larger.scss | 13 - .../vendor/font-awesome/_list.scss | 19 - .../vendor/font-awesome/_mixins.scss | 60 - .../vendor/font-awesome/_path.scss | 15 - .../vendor/font-awesome/_rotated-flipped.scss | 20 - .../vendor/font-awesome/_screen-reader.scss | 5 - .../vendor/font-awesome/_stacked.scss | 20 - .../vendor/font-awesome/_variables.scss | 800 -- assets/css/main.scss | 2 +- assets/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes assets/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes assets/fonts/fontawesome-webfont.svg | 2671 ---- assets/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes assets/fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes assets/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes assets/js/_main.js | 294 +- assets/js/lunr/lunr-en.js | 73 + assets/js/lunr/lunr-gr.js | 526 + assets/js/lunr/lunr-store.js | 49 + assets/js/lunr/lunr.js | 3475 +++++ assets/js/lunr/lunr.min.js | 6 + assets/js/main.min.js | 9 +- assets/js/plugins/gumshoe.js | 484 + .../js/plugins/jquery.ba-throttle-debounce.js | 252 + assets/js/plugins/jquery.greedy-navigation.js | 145 +- assets/js/plugins/jquery.magnific-popup.js | 2 +- assets/js/plugins/jquery.smooth-scroll.min.js | 9 - assets/js/plugins/smooth-scroll.js | 650 + assets/js/plugins/stickyfill.min.js | 8 - assets/js/vendor/jquery/jquery-1.12.4.min.js | 5 - assets/js/vendor/jquery/jquery-3.2.1.min.js | 4 - assets/js/vendor/jquery/jquery-3.5.1.js | 10872 ++++++++++++++++ banner.js | 20 +- crowdin.yaml | 5 - gm9_scripts/cleanup_sd_card.gm9 | 61 - gm9_scripts/ctrtransfer_ticket_copy.gm9 | 24 - gm9_scripts/remove_extdata.gm9 | 23 - gm9_scripts/remove_nnid.gm9 | 12 - gm9_scripts/revert_sb9si.gm9 | 19 - gm9_scripts/revert_sb9si_pre0.0.7.gm9 | 17 - gm9_scripts/safety_test.gm9 | 10 - gm9_scripts/setup_ctrnand_luma3ds.gm9 | 19 - gm9_scripts/uninstall_hax_retail_NEW.gm9 | 30 - gm9_scripts/uninstall_hax_retail_OLD.gm9 | 26 - minimal-mistakes-jekyll.gemspec | 2 +- rss.py | 70 - rss.xml | 8282 ------------ staticman.yml | 104 + 163 files changed, 20233 insertions(+), 15180 deletions(-) delete mode 100644 .bundle/config delete mode 100644 .vscode/settings.json rename LICENSE.txt => LICENSE (95%) create mode 100644 _includes/analytics-providers/google-gtag.html delete mode 100644 _includes/base_path create mode 100644 _includes/comments-providers/custom_scripts.html create mode 100644 _includes/comments-providers/giscus.html delete mode 100644 _includes/comments-providers/google-plus.html create mode 100644 _includes/comments-providers/staticman_v2.html create mode 100644 _includes/comments-providers/utterances.html create mode 100644 _includes/documents-collection.html create mode 100644 _includes/page__date.html create mode 100644 _includes/page__meta.html create mode 100644 _includes/posts-category.html create mode 100644 _includes/posts-tag.html delete mode 100644 _includes/read-time.html create mode 100644 _includes/search/algolia-search-scripts.html create mode 100644 _includes/search/google-search-scripts.html create mode 100644 _includes/search/lunr-search-scripts.html create mode 100644 _includes/search/search_form.html create mode 100644 _includes/skip-links.html create mode 100644 _includes/toc.html create mode 100644 _layouts/categories.html create mode 100644 _layouts/category.html create mode 100644 _layouts/collection.html create mode 100644 _layouts/posts.html create mode 100644 _layouts/search.html delete mode 100644 _layouts/single-no-ads.html create mode 100644 _layouts/tag.html create mode 100644 _layouts/tags.html create mode 100644 _sass/minimal-mistakes/_search.scss create mode 100644 _sass/minimal-mistakes/skins/_aqua.scss create mode 100644 _sass/minimal-mistakes/skins/_neon.scss create mode 100644 _sass/minimal-mistakes/skins/_plum.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_animated.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_bordered-pulled.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_core.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_fixed-width.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_font-awesome.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_icons.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_larger.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_list.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_mixins.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_path.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_rotated-flipped.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_screen-reader.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_stacked.scss delete mode 100644 _sass/minimal-mistakes/vendor/font-awesome/_variables.scss delete mode 100644 assets/fonts/FontAwesome.otf delete mode 100644 assets/fonts/fontawesome-webfont.eot delete mode 100644 assets/fonts/fontawesome-webfont.svg delete mode 100644 assets/fonts/fontawesome-webfont.ttf delete mode 100644 assets/fonts/fontawesome-webfont.woff delete mode 100644 assets/fonts/fontawesome-webfont.woff2 create mode 100644 assets/js/lunr/lunr-en.js create mode 100644 assets/js/lunr/lunr-gr.js create mode 100644 assets/js/lunr/lunr-store.js create mode 100644 assets/js/lunr/lunr.js create mode 100644 assets/js/lunr/lunr.min.js create mode 100644 assets/js/plugins/gumshoe.js create mode 100644 assets/js/plugins/jquery.ba-throttle-debounce.js delete mode 100644 assets/js/plugins/jquery.smooth-scroll.min.js create mode 100644 assets/js/plugins/smooth-scroll.js delete mode 100644 assets/js/plugins/stickyfill.min.js delete mode 100644 assets/js/vendor/jquery/jquery-1.12.4.min.js delete mode 100644 assets/js/vendor/jquery/jquery-3.2.1.min.js create mode 100644 assets/js/vendor/jquery/jquery-3.5.1.js delete mode 100644 crowdin.yaml delete mode 100644 gm9_scripts/cleanup_sd_card.gm9 delete mode 100644 gm9_scripts/ctrtransfer_ticket_copy.gm9 delete mode 100644 gm9_scripts/remove_extdata.gm9 delete mode 100644 gm9_scripts/remove_nnid.gm9 delete mode 100644 gm9_scripts/revert_sb9si.gm9 delete mode 100644 gm9_scripts/revert_sb9si_pre0.0.7.gm9 delete mode 100644 gm9_scripts/safety_test.gm9 delete mode 100644 gm9_scripts/setup_ctrnand_luma3ds.gm9 delete mode 100644 gm9_scripts/uninstall_hax_retail_NEW.gm9 delete mode 100644 gm9_scripts/uninstall_hax_retail_OLD.gm9 delete mode 100644 rss.py delete mode 100644 rss.xml create mode 100644 staticman.yml diff --git a/.bundle/config b/.bundle/config deleted file mode 100644 index 9bc01b4c32..0000000000 --- a/.bundle/config +++ /dev/null @@ -1,3 +0,0 @@ ---- -BUNDLE_PATH: "vendor/bundle" -BUNDLE_DISABLE_SHARED_GEMS: "true" diff --git a/.gitattributes b/.gitattributes index ebe0199207..4d536e4abe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,10 @@ -_assets/css/vendor/* linguist-vendored -_assets/js/plugins/* linguist-vendored -_assets/js/vendor/* linguist-vendored -assets/fonts/* linguist-vendored -assets/js/vendor/* linguist-vendored \ No newline at end of file +assets/fonts/* linguist-vendored +assets/js/main.min.js linguist-vendored +assets/js/lunr/* linguist-vendored +assets/js/plugins/* linguist-vendored +assets/js/vendor/* linguist-vendored +_sass/minimal-mistakes/vendor/* linguist-vendored +CHANGELOG.md text merge=union +docs/_docs/18-history.md text merge=union + +*.md text diff --git a/.gitignore b/.gitignore index c47dba95f3..5c5a91f8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,29 @@ -*.gem +# Vim +*~ +*.sw[p_] + +# Sublime Text *.sublime-project *.sublime-workspace + +# Ruby Gem +*.gem .bundle +Gemfile.lock +**/vendor/bundle + +# Node.js and NPM +node_modules +npm-debug.log* +package-lock.json +codekit-config.json + +# macOS .DS_Store -.jekyll-metadata + +# Jekyll generated files .jekyll-cache +.jekyll-metadata .sass-cache _asset_bundler_cache _site -codekit-config.json -example/_site -node_modules -npm-debug.log* -/vendor -torrents -Gemfile.lock \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 4c754dfed5..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -// Place your settings in this file to overwrite default and user settings. -{ - "files.associations": {"*.txt": "markdown"} -} \ No newline at end of file diff --git a/Gemfile b/Gemfile index bc08b6437b..ef95c2c03f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,5 @@ source "https://rubygems.org" -gem "jemoji", "~> 0.8" -gem "jekyll-redirect-from", "~>0.16" -gem "kramdown-parser-gfm", "~>1.1" gem "webrick", "~>1.7" -gemspec +gem "kramdown-parser-gfm", "~>1.1" +gem "wdm", "~> 0.1.0" if Gem.win_platform? +gemspec \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 95% rename from LICENSE.txt rename to LICENSE index 536ab071ef..3e733ff32a 100644 --- a/LICENSE.txt +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Michael Rose +Copyright (c) 2013-2020 Michael Rose and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/_config.yml b/_config.yml index bdbd3b8782..ef43253ee5 100644 --- a/_config.yml +++ b/_config.yml @@ -5,23 +5,33 @@ # For technical reasons, this file is *NOT* reloaded automatically when you use # `jekyll serve`. If you change this file, please restart the server process. -minimal_mistakes_skin : "nord" +# Theme Settings +# +# Review documentation to determine if you should use `theme` or `remote_theme` +# https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/#installing-the-theme + +# theme : "minimal-mistakes-jekyll" +# remote_theme : "mmistakes/minimal-mistakes" +minimal_mistakes_skin : "nord" # "default" # "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum", "sunrise" # Site Settings locale : "en-US" title : "3DS Hacks Guide" title_separator : "-" +subtitle : # site tagline that appears below site title in masthead name : "Nintendo Homebrew" description : "Full sighax CFW Guide" url : "https://3ds.hacks.guide" # the base hostname & protocol for your site e.g. "https://mmistakes.github.io" enforce_ssl : "3ds.hacks.guide" baseurl : # the subpath of your site, e.g. "/blog" repository : "hacks-guide/Guide_3DS" # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes" -teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png" -breadcrumbs : # true, false (default) +teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png" +logo : # path of logo image to display in the masthead, e.g. "/assets/images/88x88.png" +masthead_title : # overrides the website title displayed in the masthead, use " " for no title +# breadcrumbs : false # true, false (default) words_per_minute : 200 comments: - provider : # false (default), "disqus", "discourse", "facebook", "google-plus", "staticman", "custom" + provider : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "giscus", "custom" disqus: shortname : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname- discourse: @@ -31,30 +41,41 @@ comments: appid : num_posts : # 5 (default) colorscheme : # "light" (default), "dark" -staticman: - allowedFields : ['name', 'email', 'url', 'message'] - branch : "master" - commitMessage : "New comment." - filename : comment-{@timestamp} - format : "yml" - moderation : true - path : "_data/comments/{options.slug}" - requiredFields : ['name', 'email', 'message'] - transforms: - email : "md5" - generatedFields: - date: - type : "date" - options: - format : "iso8601" # "iso8601" (default), "timestamp-seconds", "timestamp-milliseconds" + utterances: + theme : # "github-light" (default), "github-dark" + issue_term : # "pathname" (default) + giscus: + repo_id : # Shown during giscus setup at https://giscus.app + category_name : # Full text name of the category + category_id : # Shown during giscus setup at https://giscus.app + discussion_term : # "pathname" (default), "url", "title", "og:title" + reactions_enabled : # '1' for enabled (default), '0' for disabled + theme : # "light" (default), "dark", "dark_dimmed", "transparent_dark", "preferred_color_scheme" + staticman: + branch : # "master" + endpoint : # "https://{your Staticman v3 API}/v3/entry/github/" +reCaptcha: + siteKey : + secret : atom_feed: path : # blank (default) uses feed.xml - + hide : # true, false (default) +search : # true, false (default) +search_full_content : # true, false (default) +search_provider : # lunr (default), algolia, google +algolia: + application_id : # YOUR_APPLICATION_ID + index_name : # YOUR_INDEX_NAME + search_only_api_key : # YOUR_SEARCH_ONLY_API_KEY + powered_by : # true (default), false +google: + search_engine_id : # YOUR_SEARCH_ENGINE_ID + instant_search : # false (default), true # SEO Related google_site_verification : jVXoPK_-qzKJp4SScnZYpOIX3yDXfGnAoTBJYixUOwg bing_site_verification : F3532011519E308583A0A2CAF2DD69E8 -alexa_site_verification : yandex_site_verification : +naver_site_verification : # Social Sharing twitter: @@ -73,108 +94,127 @@ social: # Analytics analytics: - provider : "google-universal" # false (default), "google", "google-universal", "custom" + provider : "google-universal" # false (default), "google", "google-universal", "google-gtag", "custom" google: tracking_id : "UA-86465881-1" + anonymize_ip : # true, false (default) # Site Author author: name : "Nintendo Homebrew" - avatar : + avatar : # path of avatar image, e.g. "/assets/images/bio-photo.jpg" bio : "Nintendo Homebrew Community" location : "Nullsec" - email : - uri : - bitbucket : - codepen : - dribbble : - flickr : - facebook : - foursquare : - github : "nh-server" - google_plus : - keybase : - instagram : - lastfm : - linkedin : - pinterest : - soundcloud : - stackoverflow : # "123456/username" (the last part of your profile url, e.g. http://stackoverflow.com/users/123456/username) - steam : - tumblr : - twitter : - vine : - weibo : - xing : - youtube : + email : + links: + # - label: "Email" + # icon: "fas fa-fw fa-envelope-square" + # url: "mailto:your.name@email.com" + # - label: "Website" + # icon: "fas fa-fw fa-link" + # url: "https://your-website.com" + # - label: "Twitter" + # icon: "fab fa-fw fa-twitter-square" + # url: "https://twitter.com/" + # - label: "Facebook" + # icon: "fab fa-fw fa-facebook-square" + # url: "https://facebook.com/" + - label: "GitHub" + icon: "fab fa-fw fa-github" + url: "https://github.com/nh-server" + # - label: "Instagram" + # icon: "fab fa-fw fa-instagram" + # url: "https://instagram.com/" + +# Site Footer +footer: + links: + # - label: "Twitter" + # icon: "fab fa-fw fa-twitter-square" + # url: + # - label: "Facebook" + # icon: "fab fa-fw fa-facebook-square" + # url: + - label: "GitHub" + icon: "fab fa-fw fa-github" + url: "https://github.com/nh-server" + # - label: "GitLab" + # icon: "fab fa-fw fa-gitlab" + # url: + # - label: "Bitbucket" + # icon: "fab fa-fw fa-bitbucket" + # url: + # - label: "Instagram" + # icon: "fab fa-fw fa-instagram" + # url: # Reading Files include: - - .htaccess - - _pages - - _pages/en_US -exclude: [ - "*.sublime-project", - "*.sublime-workspace", - vendor, - .asset-cache, - .bundle, - .jekyll-assets-cache, - .sass-cache, - assets/js/plugins, - assets/js/_main.js, - assets/js/vendor, - Capfile, - CHANGELOG, - config, - Gemfile, - Gruntfile.js, - gulpfile.js, - LICENSE, - log, - node_modules, - package.json, - Rakefile, - README, - tmp, - _pages/af_ZA, - _pages/ar_SA, - _pages/ca_ES, - _pages/cs_CZ, - _pages/da_DK, - # _pages/de_DE, - _pages/el_GR, - _pages/en_PT, + - .htaccess + - _pages + - _pages/en_US +exclude: + - "*.sublime-project" + - "*.sublime-workspace" + - vendor + - .asset-cache + - .bundle + - .jekyll-assets-cache + - .sass-cache + - assets/js/plugins + - assets/js/_main.js + - assets/js/vendor + - Capfile + - CHANGELOG + - config + - Gemfile + - Gruntfile.js + - gulpfile.js + - LICENSE + - log + - node_modules + - package.json + - package-lock.json + - Rakefile + - README + - tmp + - _pages/af_ZA, + - _pages/ar_SA, + - _pages/ca_ES, + - _pages/cs_CZ, + - _pages/da_DK, + # - _pages/de_DE, + - _pages/el_GR, + - _pages/en_PT, # _pages/en_US, - _pages/es_EM, - # _pages/es_ES, - # _pages/fi_FI, - # _pages/fr_FR, - # _pages/he_IL, - # _pages/hu_HU, - _pages/id_ID, - # _pages/it_IT, - # _pages/ja_JP, - _pages/ko_KR, - _pages/ms_MY, - _pages/no_NO, - _pages/nl_NL, - # _pages/pl_PL, - # _pages/pt_BR, - _pages/pt_PT, - # _pages/ro_RO, - # _pages/ru_RU, - _pages/sr_SP, - _pages/sv_SE, - _pages/th_TH, - _pages/tr_TR, - _pages/uk_UA, - _pages/vi_VN, - # _pages/zh_CN, - # _pages/zh_TW, -] + - _pages/es_EM, + # - _pages/es_ES, + # - _pages/fi_FI, + # - _pages/fr_FR, + # - _pages/he_IL, + # - _pages/hu_HU, + - _pages/id_ID, + # - _pages/it_IT, + # - _pages/ja_JP, + - _pages/ko_KR, + - _pages/ms_MY, + - _pages/no_NO, + - _pages/nl_NL, + # - _pages/pl_PL, + # - _pages/pt_BR, + - _pages/pt_PT, + # - _pages/ro_RO, + # - _pages/ru_RU, + - _pages/sr_SP, + - _pages/sv_SE, + - _pages/th_TH, + - _pages/tr_TR, + - _pages/uk_UA, + - _pages/vi_VN, + # - _pages/zh_CN, + # - _pages/zh_TW, keep_files: - .git @@ -206,16 +246,23 @@ kramdown: # Sass/SCSS sass: sass_dir: _sass - style: compressed # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style + style: compressed # https://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style -# Plugins + +# Outputting +permalink: /:categories/:title/ +paginate: 5 # amount of posts to show +paginate_path: /page:num/ +timezone: # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + + +# Plugins (previously gems:) plugins: - jekyll-paginate - jekyll-sitemap - jekyll-gist - jekyll-feed - - jemoji - - jekyll-redirect-from + - jekyll-include-cache # mimic GitHub Pages with --safe whitelist: @@ -223,7 +270,7 @@ whitelist: - jekyll-sitemap - jekyll-gist - jekyll-feed - - jemoji + - jekyll-include-cache # Archives @@ -234,8 +281,8 @@ whitelist: # - Archive page should exist at path when using Liquid method or you can # expect broken links (especially with breadcrumbs enabled) # - /tags/my-awesome-tag/index.html ~> path: /tags/ -# - path: /categories/ -# - path: / +# - /categories/my-awesome-category/index.html ~> path: /categories/ +# - /my-awesome-category/index.html ~> path: / category_archive: type: liquid path: /categories/ @@ -256,12 +303,13 @@ tag_archive: # HTML Compression -# - http://jch.penibelst.de/ +# - https://jch.penibelst.de/ compress_html: clippings: all ignore: envs: development + # Defaults defaults: # _pages diff --git a/_data/navigation/en_US.yml b/_data/navigation/en_US.yml index 12f7d7bd53..a517f7297c 100644 --- a/_data/navigation/en_US.yml +++ b/_data/navigation/en_US.yml @@ -1,6 +1,6 @@ --- main: - - + - title: Home url: / - diff --git a/_includes/analytics-providers/google-gtag.html b/_includes/analytics-providers/google-gtag.html new file mode 100644 index 0000000000..16d0cf176b --- /dev/null +++ b/_includes/analytics-providers/google-gtag.html @@ -0,0 +1,9 @@ + + + diff --git a/_includes/analytics-providers/google-universal.html b/_includes/analytics-providers/google-universal.html index 10d65b2ee4..68c2674ba9 100644 --- a/_includes/analytics-providers/google-universal.html +++ b/_includes/analytics-providers/google-universal.html @@ -1,9 +1,7 @@ + diff --git a/_includes/analytics-providers/google.html b/_includes/analytics-providers/google.html index b591b99543..c5742b9817 100644 --- a/_includes/analytics-providers/google.html +++ b/_includes/analytics-providers/google.html @@ -1,6 +1,9 @@ - \ No newline at end of file + diff --git a/_includes/analytics.html b/_includes/analytics.html index 64a3359aad..371469f0af 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -1,10 +1,12 @@ -{% if site.analytics.provider and page.analytics != false %} +{% if jekyll.environment == 'production' and site.analytics.provider and page.analytics != false %} {% case site.analytics.provider %} {% when "google" %} {% include /analytics-providers/google.html %} {% when "google-universal" %} {% include /analytics-providers/google-universal.html %} +{% when "google-gtag" %} + {% include /analytics-providers/google-gtag.html %} {% when "custom" %} {% include /analytics-providers/custom.html %} {% endcase %} diff --git a/_includes/archive-single.html b/_includes/archive-single.html index dc9ac73752..68174807ef 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -10,29 +10,21 @@ {% assign title = post.title %} {% endif %} -
-
+
+
{% if include.type == "grid" and teaser %}
- +
{% endif %} -

+

{% if post.link %} - {{ title }} Permalink + {{ title }} Permalink {% else %} - {{ title }} + {{ title }} {% endif %}

- {% if post.read_time %} -

{% include read-time.html %}

- {% endif %} + {% include page__meta.html type=include.type %} {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %}
diff --git a/_includes/author-profile-custom-links.html b/_includes/author-profile-custom-links.html index 3560e25885..b89ffcb7df 100644 --- a/_includes/author-profile-custom-links.html +++ b/_includes/author-profile-custom-links.html @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 2d10543126..d384ee7343 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,27 +1,30 @@ -{% if page.author and site.data.authors[page.author] %} - {% assign author = site.data.authors[page.author] %} -{% else %} - {% assign author = site.author %} -{% endif %} +{% assign author = page.author | default: page.authors[0] | default: site.author %} +{% assign author = site.data.authors[author] | default: author %} -
+
{% if author.avatar %}
- {% if author.avatar contains "://" %} - {{ author.name }} + {% if author.home %} + + {{ author.name }} + {% else %} - {{ author.name }} + {{ author.name }} {% endif %}
{% endif %}
-

{{ author.name }}

+ {% if author.home %} +

{{ author.name }}

 + {% else %} +

{{ author.name }}

+ {% endif %} {% if author.bio %} -

- {{ author.bio }} -

+
+ {{ author.bio | markdownify }} +
{% endif %}
@@ -29,15 +32,23 @@ - + \ No newline at end of file diff --git a/_includes/page__date.html b/_includes/page__date.html new file mode 100644 index 0000000000..4f995ed0a6 --- /dev/null +++ b/_includes/page__date.html @@ -0,0 +1,6 @@ +{% assign date_format = site.date_format | default: "%B %-d, %Y" %} +{% if page.last_modified_at %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+{% elsif page.date %} +

{{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

+{% endif %} diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 93e9155fb6..dd1c26fbf1 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,25 +1,13 @@ -{% if page.header.image contains "://" %} - {% capture img_path %}{{ page.header.image }}{% endcapture %} -{% else %} - {% capture img_path %}{{ page.header.image | absolute_url }}{% endcapture %} -{% endif %} +{% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %} -{% if page.header.cta_url contains "://" %} - {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %} -{% else %} - {% capture cta_path %}{{ page.header.cta_url | absolute_url }}{% endcapture %} -{% endif %} - -{% if page.header.overlay_image contains "://" %} - {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} -{% elsif page.header.overlay_image %} - {% capture overlay_img_path %}{{ page.header.overlay_image | absolute_url }}{% endcapture %} -{% endif %} - -{% if page.header.overlay_filter contains "rgba" %} +{% if page.header.overlay_filter contains "gradient" %} {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} +{% elsif page.header.overlay_filter contains "rgba" %} + {% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% elsif page.header.overlay_filter %} {% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %} + {% capture overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}){% endcapture %} {% endif %} {% if page.header.image_description %} @@ -31,29 +19,35 @@ {% assign image_description = image_description | markdownify | strip_html | strip_newlines | escape_once %}
{% if page.header.overlay_color or page.header.overlay_image %}
-

+

{% if paginator and site.paginate_show_page_num %} {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %} {% else %} {{ page.title | default: site.title | markdownify | remove: "

" | remove: "

" }} {% endif %}

- {% if page.excerpt %} + {% if page.tagline %} +

{{ page.tagline | markdownify | remove: "

" | remove: "

" }}

+ {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}

{{ page.excerpt | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% if site.read_time and page.read_time %} -

{% include read-time.html %}

- {% endif %} + {% include page__meta.html %} {% if page.header.cta_url %} -

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

+

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

+ {% endif %} + {% if page.header.actions %} +

+ {% for action in page.header.actions %} + {{ action.label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }} + {% endfor %} {% endif %}

{% else %} - {{ image_description }} + {{ image_description }} {% endif %} {% if page.header.caption %} {{ page.header.caption | markdownify | remove: "

" | remove: "

" }} diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html index 8586a95a2b..a313a23d45 100644 --- a/_includes/page__hero_video.html +++ b/_includes/page__hero_video.html @@ -1,4 +1,2 @@ -{% capture video_id %}{{ page.header.video.id }}{% endcapture %} -{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %} - -{% include video id=video_id provider=video_provider %} +{% assign video = page.header.video %} +{% include video id=video.id provider=video.provider danmaku=video.danmaku %} diff --git a/_includes/page__meta.html b/_includes/page__meta.html new file mode 100644 index 0000000000..3d228c9212 --- /dev/null +++ b/_includes/page__meta.html @@ -0,0 +1,31 @@ +{% assign document = post | default: page %} +{% if document.read_time or document.show_date %} +

+ {% if document.show_date and document.date %} + {% assign date = document.date %} + + + {% assign date_format = site.date_format | default: "%B %-d, %Y" %} + + + {% endif %} + + {% if document.read_time and document.show_date %}{% endif %} + + {% if document.read_time %} + {% assign words_per_minute = document.words_per_minute | default: site.words_per_minute | default: 200 %} + {% assign words = document.content | strip_html | number_of_words %} + + + + {% if words < words_per_minute %} + {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% elsif words == words_per_minute %} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% else %} + {{ words | divided_by: words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% endif %} + + {% endif %} +

+{% endif %} diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html index f10b2026a2..75c76c81dd 100644 --- a/_includes/page__taxonomy.html +++ b/_includes/page__taxonomy.html @@ -4,4 +4,4 @@ {% if site.category_archive.type and page.categories[0] %} {% include category-list.html %} -{% endif %} +{% endif %} \ No newline at end of file diff --git a/_includes/paginator.html b/_includes/paginator.html index cf49ae8a25..bffa079467 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -1,13 +1,13 @@ {% if paginator.total_pages > 1 %}