mikewalch closed pull request #121: Updated GitHub pages to latest version URL: https://github.com/apache/fluo-website/pull/121
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/Gemfile b/Gemfile index 604d36d..6bb0e7d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ source 'https://rubygems.org' -gem 'github-pages', '110', group: :jekyll_plugins +gem 'github-pages', '172', group: :jekyll_plugins gem 'therubyracer', '0.12.3' -# Added because newer versions of nokogiri don't work with older versions of Ruby -gem 'nokogiri', '1.6.8.1' diff --git a/Gemfile.lock b/Gemfile.lock index 2199ed6..07585b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,185 +1,223 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.7) + activesupport (4.2.9) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.12.2) + coffee-script-source (1.11.1) colorator (1.1.0) - ethon (0.10.1) + commonmarker (0.17.7.1) + ruby-enum (~> 0.5) + concurrent-ruby (1.0.5) + ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.12.1) + faraday (0.13.1) multipart-post (>= 1.2, < 3) ffi (1.9.18) forwardable-extended (2.6.0) - gemoji (2.1.0) - github-pages (110) - activesupport (= 4.2.7) - github-pages-health-check (= 1.3.0) - jekyll (= 3.3.1) - jekyll-avatar (= 0.4.2) - jekyll-coffeescript (= 1.0.1) + gemoji (3.0.0) + github-pages (172) + activesupport (= 4.2.9) + github-pages-health-check (= 1.3.5) + jekyll (= 3.6.2) + jekyll-avatar (= 0.5.0) + jekyll-coffeescript (= 1.0.2) + jekyll-commonmark-ghpages (= 0.1.3) jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.8.0) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.2.0) + jekyll-feed (= 0.9.2) + jekyll-gist (= 1.4.1) + jekyll-github-metadata (= 2.9.3) jekyll-mentions (= 1.2.0) - jekyll-optional-front-matter (= 0.1.2) + jekyll-optional-front-matter (= 0.3.0) jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.0.3) - jekyll-redirect-from (= 0.11.0) - jekyll-relative-links (= 0.2.1) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.1.0) - jekyll-sitemap (= 0.12.0) + jekyll-readme-index (= 0.2.0) + jekyll-redirect-from (= 0.12.1) + jekyll-relative-links (= 0.5.2) + jekyll-remote-theme (= 0.2.3) + jekyll-sass-converter (= 1.5.0) + jekyll-seo-tag (= 2.3.0) + jekyll-sitemap (= 1.1.1) jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.0.3) - jekyll-theme-cayman (= 0.0.3) - jekyll-theme-dinky (= 0.0.3) - jekyll-theme-hacker (= 0.0.3) - jekyll-theme-leap-day (= 0.0.3) - jekyll-theme-merlot (= 0.0.3) - jekyll-theme-midnight (= 0.0.3) - jekyll-theme-minimal (= 0.0.3) - jekyll-theme-modernist (= 0.0.3) - jekyll-theme-primer (= 0.1.5) - jekyll-theme-slate (= 0.0.3) - jekyll-theme-tactile (= 0.0.3) - jekyll-theme-time-machine (= 0.0.3) - jekyll-titles-from-headings (= 0.1.2) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) + jekyll-theme-architect (= 0.1.0) + jekyll-theme-cayman (= 0.1.0) + jekyll-theme-dinky (= 0.1.0) + jekyll-theme-hacker (= 0.1.0) + jekyll-theme-leap-day (= 0.1.0) + jekyll-theme-merlot (= 0.1.0) + jekyll-theme-midnight (= 0.1.0) + jekyll-theme-minimal (= 0.1.0) + jekyll-theme-modernist (= 0.1.0) + jekyll-theme-primer (= 0.5.2) + jekyll-theme-slate (= 0.1.0) + jekyll-theme-tactile (= 0.1.0) + jekyll-theme-time-machine (= 0.1.0) + jekyll-titles-from-headings (= 0.5.0) + jemoji (= 0.8.1) + kramdown (= 1.14.0) + liquid (= 4.0.0) listen (= 3.0.6) mercenary (~> 0.3) - minima (= 2.0.0) - rouge (= 1.11.1) + minima (= 2.1.1) + rouge (= 2.2.1) terminal-table (~> 1.4) - github-pages-health-check (1.3.0) + github-pages-health-check (1.3.5) addressable (~> 2.3) net-dns (~> 0.8) octokit (~> 4.0) public_suffix (~> 2.0) typhoeus (~> 0.7) - html-pipeline (2.6.0) + html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) - i18n (0.8.4) - jekyll (3.3.1) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jekyll (3.6.2) addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) + kramdown (~> 1.14) + liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 3) safe_yaml (~> 1.0) - jekyll-avatar (0.4.2) + jekyll-avatar (0.5.0) jekyll (~> 3.0) - jekyll-coffeescript (1.0.1) + jekyll-coffeescript (1.0.2) coffee-script (~> 2.2) + coffee-script-source (~> 1.11.1) + jekyll-commonmark (1.1.0) + commonmarker (~> 0.14) + jekyll (>= 3.0, < 4.0) + jekyll-commonmark-ghpages (0.1.3) + commonmarker (~> 0.17.6) + jekyll-commonmark (~> 1) + rouge (~> 2) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.8.0) + jekyll-feed (0.9.2) jekyll (~> 3.3) - jekyll-gist (1.4.0) + jekyll-gist (1.4.1) octokit (~> 4.2) - jekyll-github-metadata (2.2.0) + jekyll-github-metadata (2.9.3) jekyll (~> 3.1) octokit (~> 4.0, != 4.4.0) jekyll-mentions (1.2.0) activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) - jekyll-optional-front-matter (0.1.2) + jekyll-optional-front-matter (0.3.0) jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.0.3) + jekyll-readme-index (0.2.0) jekyll (~> 3.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-relative-links (0.2.1) + jekyll-redirect-from (0.12.1) jekyll (~> 3.3) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.1.0) + jekyll-relative-links (0.5.2) jekyll (~> 3.3) - jekyll-sitemap (0.12.0) + jekyll-remote-theme (0.2.3) + jekyll (~> 3.5) + rubyzip (>= 1.2.1, < 3.0) + typhoeus (>= 0.7, < 2.0) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-seo-tag (2.3.0) jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.0.3) - jekyll (~> 3.3) - jekyll-theme-cayman (0.0.3) - jekyll (~> 3.3) - jekyll-theme-dinky (0.0.3) - jekyll (~> 3.3) - jekyll-theme-hacker (0.0.3) - jekyll (~> 3.3) - jekyll-theme-leap-day (0.0.3) - jekyll (~> 3.3) - jekyll-theme-merlot (0.0.3) - jekyll (~> 3.3) - jekyll-theme-midnight (0.0.3) - jekyll (~> 3.3) - jekyll-theme-minimal (0.0.3) - jekyll (~> 3.3) - jekyll-theme-modernist (0.0.3) + jekyll-sitemap (1.1.1) jekyll (~> 3.3) - jekyll-theme-primer (0.1.5) - jekyll (~> 3.3) - jekyll-theme-slate (0.0.3) - jekyll (~> 3.3) - jekyll-theme-tactile (0.0.3) - jekyll (~> 3.3) - jekyll-theme-time-machine (0.0.3) - jekyll (~> 3.3) - jekyll-titles-from-headings (0.1.2) - jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - jemoji (0.7.0) - activesupport (~> 4.0) - gemoji (~> 2.0) + jekyll-swiss (0.4.0) + jekyll-theme-architect (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.5.2) + jekyll (~> 3.5) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.2) + jekyll-theme-slate (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-time-machine (0.1.0) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-titles-from-headings (0.5.0) + jekyll (~> 3.3) + jekyll-watch (1.5.1) + listen (~> 3.0) + jemoji (0.8.1) + activesupport (~> 4.0, >= 4.2.9) + gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0) - json (1.8.6) - kramdown (1.11.1) + kramdown (1.14.0) libv8 (3.16.14.19) - liquid (3.0.6) + liquid (4.0.0) listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.1.0) - minima (2.0.0) - minitest (5.10.2) + mini_portile2 (2.3.0) + minima (2.1.1) + jekyll (~> 3.3) + minitest (5.10.3) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - octokit (4.7.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.14.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) public_suffix (2.0.5) - rb-fsevent (0.9.8) + rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) ref (2.0.0) - rouge (1.11.1) + rouge (2.2.1) + ruby-enum (0.7.1) + i18n + rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.4.24) + sass (3.5.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) @@ -191,7 +229,7 @@ GEM thread_safe (0.3.6) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) unicode-display_width (1.3.0) @@ -199,6 +237,8 @@ PLATFORMS ruby DEPENDENCIES - github-pages (= 110) - nokogiri (= 1.6.8.1) + github-pages (= 172) therubyracer (= 0.12.3) + +BUNDLED WITH + 1.15.4 diff --git a/_config.yml b/_config.yml index 952b790..0cf13de 100644 --- a/_config.yml +++ b/_config.yml @@ -2,9 +2,10 @@ title: Apache Fluo url: "https://fluo.apache.org/"; # the base hostname & protocol for your site timezone: Etc/UTC - permalink: pretty +markdown: kramdown + # Collection names cannot contain periods collections: fluo-1-2: @@ -92,12 +93,7 @@ old_api_base: "https://javadoc.io/doc/io.fluo"; old_api_static: "https://static.javadoc.io/io.fluo"; whitelist: [jekyll-redirect-from] -gems: [jekyll-redirect-from] +plugins: [jekyll-redirect-from] #Social twitter_username: "ApacheFluo" - -kramdown: - input: GFM - syntax_highlighter: rouge - hard_wrap: false diff --git a/_fluo-1-2/index.md b/_fluo-1-2/index.md index 349b42d..38f3678 100644 --- a/_fluo-1-2/index.md +++ b/_fluo-1-2/index.md @@ -1,4 +1,4 @@ --- title: Apache Fluo documentation -redirect_to: getting-started/design +redirect_to: /docs/fluo/1.2/getting-started/design --- diff --git a/_recipes-1-2/index.md b/_recipes-1-2/index.md index f59c6ff..be254a2 100644 --- a/_recipes-1-2/index.md +++ b/_recipes-1-2/index.md @@ -1,4 +1,4 @@ --- title: Apache Fluo documentation -redirect_to: getting-started/overview +redirect_to: /docs/fluo-recipes/1.2/getting-started/overview --- diff --git a/_sass/pygments-tomorrow.scss b/_sass/_syntax-highlighting.scss similarity index 95% rename from _sass/pygments-tomorrow.scss rename to _sass/_syntax-highlighting.scss index b46ecbc..a72eb09 100755 --- a/_sass/pygments-tomorrow.scss +++ b/_sass/_syntax-highlighting.scss @@ -23,20 +23,20 @@ .highlight .kn { color: #3e999f } /* Keyword.Namespace */ .highlight .kp { color: #8959a8 } /* Keyword.Pseudo */ .highlight .kr { color: #8959a8 } /* Keyword.Reserved */ -.highlight .kt { color: #eab700 } /* Keyword.Type */ +.highlight .kt { color: #917f0d } /* Keyword.Type */ .highlight .ld { color: #718c00 } /* Literal.Date */ .highlight .m { color: #f5871f } /* Literal.Number */ .highlight .s { color: #718c00 } /* Literal.String */ .highlight .na { color: #4271ae } /* Name.Attribute */ .highlight .nb { color: #4d4d4c } /* Name.Builtin */ -.highlight .nc { color: #eab700 } /* Name.Class */ +.highlight .nc { color: #917f0d } /* Name.Class */ .highlight .no { color: #c82829 } /* Name.Constant */ .highlight .nd { color: #3e999f } /* Name.Decorator */ .highlight .ni { color: #4d4d4c } /* Name.Entity */ .highlight .ne { color: #c82829 } /* Name.Exception */ .highlight .nf { color: #4271ae } /* Name.Function */ .highlight .nl { color: #4d4d4c } /* Name.Label */ -.highlight .nn { color: #eab700 } /* Name.Namespace */ +.highlight .nn { color: #917f0d } /* Name.Namespace */ .highlight .nx { color: #4271ae } /* Name.Other */ .highlight .py { color: #4d4d4c } /* Name.Property */ .highlight .nt { color: #3e999f } /* Name.Tag */ diff --git a/css/fluo.scss b/css/fluo.scss index e6d5a2e..6e0d93d 100644 --- a/css/fluo.scss +++ b/css/fluo.scss @@ -1,6 +1,8 @@ --- --- +@import "syntax-highlighting"; + table { margin: 10px 0px 30px 0px; padding: 10px 5px 10px 5px; @@ -39,11 +41,6 @@ code { tr:nth-child(even) {background: #F3F3F3} tr:nth-child(odd) {background: #FFF} -.highlight { - padding-left: 8px; - padding-bottom: 4px; -} - .post-title-home { a { color: inherit; @@ -99,5 +96,3 @@ tr:nth-child(odd) {background: #FFF} height: 30px; } } - -@import "pygments-tomorrow"; diff --git a/pages/download.md b/pages/download.md index 03a8e1c..3787c6a 100644 --- a/pages/download.md +++ b/pages/download.md @@ -2,7 +2,7 @@ layout: page title: Download Apache Fluo permalink: /download/ -redirect_to: /release/fluo-{{ site.latest_fluo_release }}/ +redirect_to: /release/ --- This page should redirect to the latest Apache Fluo release. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
