diff --git a/.ruby-version b/.ruby-version index 31af499..76521af 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-1.9.3 \ No newline at end of file +ruby-2.2.0 diff --git a/Gemfile b/Gemfile index a28dfb2..1fec769 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source "http://rubygems.org" gem "github-pages" +gem "rouge" diff --git a/Gemfile.lock b/Gemfile.lock index f530986..073dad8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,3 +129,4 @@ PLATFORMS DEPENDENCIES github-pages + rouge diff --git a/README.markdown b/README.markdown index b41e3d4..96afe56 100644 --- a/README.markdown +++ b/README.markdown @@ -4,6 +4,9 @@ Spring's project pages are based on [Jekyll](http://jekyllrb.com) and [GitHub Pa This approach may sound a little funky (and it is), but it's way better than the misery of Git submodules. In fact, it's actually pretty easy. If you're just getting started, then follow the directions immediately below. If you're needing a refresher on how to keep things up to date, then head to the section at the bottom on "keeping up to date". +> ***Note:*** Github changed their rendering (a lot) in April 2016. If you are seeing pages build failures since that time, then you probably need to merge some changes from this upstream. Follow the instructions below, and for testing locally use rubiy 2.x and don't forget to `bundle exec ...` everything. + + # How to start a new `gh-pages` project page @@ -95,7 +98,7 @@ Assuming you're already within your project's clone directory, and you've alread ### Install jekyll if you have not already -> **Note:** Jekyll 1.1.2 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it: +> **Note:** Jekyll 3.0.4 is a known good version, and it is specifically referred to in `Gemfile.lock` so you have to use `bundle` (not `gem install ...`) to install it: gem install bundler bundle @@ -104,7 +107,7 @@ Assuming you're already within your project's clone directory, and you've alread Use the `--watch` flag to pick up changes to files as you make them, allowing you a nice edit-and-refresh workflow. - jekyll serve --watch + bundle exec jekyll serve --watch > **Important:** Because the `baseurl` is set explicitly within your project's `_config.yml` file, you'll need to fully-qualify the URL to view your project. For example, if your project is named "spring-xyz", your URL when running Jekyll locally will be . Don't forget the trailing slash! You'll get a 404 without it. diff --git a/_config.yml b/_config.yml index 18934fd..c63970b 100644 --- a/_config.yml +++ b/_config.yml @@ -38,6 +38,6 @@ custom_gradle_template: true ### The following properties are constant for most projects -main_site_url: http://spring.io -projects_site_url: http://cloud.spring.io -questions_url: http://spring.io/questions +main_site_url: https://spring.io +projects_site_url: https://cloud.spring.io +questions_url: https://spring.io/questions diff --git a/_includes/badges.html b/_includes/badges.html index ae873f4..e9d8571 100644 --- a/_includes/badges.html +++ b/_includes/badges.html @@ -1,7 +1,7 @@ {% if page.badges.twitter %}
- @@ -9,7 +9,7 @@ {% for badge in page.badges.custom %}
-
+
diff --git a/_includes/page.html b/_includes/page.html index f342858..580751d 100644 --- a/_includes/page.html +++ b/_includes/page.html @@ -1,10 +1,10 @@ {{ site.name }} - + - + @@ -18,21 +18,21 @@ {{ head_links }} - - - + + + - - - - - - + + + + + - + Pivotal Software, Inc. All Rights Reserved. - Terms of Use and - Privacy -
-
-
- - -
+ © Pivotal Software, Inc. All Rights Reserved. + Terms of Use and + Privacy
diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html index 1495ae5..b06f96e 100644 --- a/_includes/widget_templates.html +++ b/_includes/widget_templates.html @@ -18,8 +18,12 @@
- Reference - API + {@ if (release.refDocUrl !== '') { @} + Reference + {@ }; @} + {@ if (release.apiDocUrl !== '') { @} + API + {@ }; @}
{@ }); @} @@ -29,26 +33,6 @@ - -