diff options
| author | Mark Otto <[email protected]> | 2014-03-10 13:21:56 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-10 13:21:56 -0700 |
| commit | 3fb5d0bbac39e62fb24c08eda2f6c22b6809007b (patch) | |
| tree | 05974fffa28494d4d38ed8627f2e00ae949635e8 | |
| parent | 0b7b374691710c9b07d890c444cdb04fbbe1b6f1 (diff) | |
| parent | 91d0a6d7792e8d76108701077b3d838f8f53e7ae (diff) | |
| download | bootstrap-3fb5d0bbac39e62fb24c08eda2f6c22b6809007b.tar.xz bootstrap-3fb5d0bbac39e62fb24c08eda2f6c22b6809007b.zip | |
Merge branch 'master' into modular-the-mixins
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | docs/_includes/customizer-variables.html | 1 | ||||
| -rw-r--r-- | less/variables.less | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 03e457a0e..6421dc48d 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=" diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 7f2dd58b7..e807e1231 100644 --- 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> diff --git a/less/variables.less b/less/variables.less index 82616ac56..cdc1ba881 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>`. @body-bg: #fff; |