Merge branch 'master' into modular-the-mixins

3fb5d0bb · Mark Otto · 0b7b3746 · 91d0a6d7 · 3fb5d0bb · 3fb5d0bb
Commit 3fb5d0bb authored Mar 10, 2014 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.travis.yml .travis.yml +1 -1

docs/_includes/customizer-variables.html docs/_includes/customizer-variables.html +1 -0

less/variables.less less/variables.less +1 -1

No files found.
--- 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="

--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -45,6 +45,7 @@
  </div>
 </div>
 <h2 id="scaffolding">Scaffolding</h2>
+<p>Settings for some of the most global styles.</p>
 <div class="row">
  <div class="bs-customizer-input">
    <label for="input-@body-bg">@body-bg</label>

--- 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>`.
 @body-bg:               #fff;