From 1a417357ad19e5797bb338cca7de9bd8b7dbabc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 10 Mar 2014 08:35:50 +0100 Subject: [PATCH 1/2] Add missing customizer comment --- docs/_includes/customizer-variables.html | 1 + less/variables.less | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 7f2dd58b7e..e807e1231d 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -45,6 +45,7 @@

Scaffolding

+

Settings for some of the most global styles.

diff --git a/less/variables.less b/less/variables.less index 82616ac562..cdc1ba8813 100644 --- a/less/variables.less +++ b/less/variables.less @@ -22,7 +22,7 @@ //== Scaffolding // -// ## Settings for some of the most global styles. +//## Settings for some of the most global styles. //** Background color for ``. @body-bg: #fff; From 91d0a6d7792e8d76108701077b3d838f8f53e7ae Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 10 Mar 2014 16:58:16 +0200 Subject: [PATCH 2/2] Bump Jekyll version used in Travis to v1.4.2. Note that while v1.4.3 is the latest stable version, it has a nasty Windows bug. (https://github.com/jekyll/jekyll/issues/1948) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03e457a0e0..6421dc48dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ after_script: - if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py upload rubygems pseudo_Gemfile.lock $(rvm gemdir); fi env: global: - - JEKYLL_VERSION: 1.4.1 + - JEKYLL_VERSION: 1.4.2 - SAUCE_USERNAME: bootstrap - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="