Skip to content
GitLab
Commit 3fb5d0bb authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' into modular-the-mixins

parents 0b7b3746 91d0a6d7
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
+3 -2
.travis.yml
+ 1
- 1
View file @ 3fb5d0bb
...@@ -14,7 +14,7 @@ after_script: ...@@ -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 - if [ "$TWBS_TEST" = validate-html ]; then time ./test-infra/s3_cache.py upload rubygems pseudo_Gemfile.lock $(rvm gemdir); fi
env: env:
global: global:
- JEKYLL_VERSION: 1.4.1 - JEKYLL_VERSION: 1.4.2
- SAUCE_USERNAME: bootstrap - SAUCE_USERNAME: bootstrap
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
......
docs/_includes/customizer-variables.html
+ 1
- 0
View file @ 3fb5d0bb
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
</div> </div>
</div> </div>
<h2 id="scaffolding">Scaffolding</h2> <h2 id="scaffolding">Scaffolding</h2>
<p>Settings for some of the most global styles.</p>
<div class="row"> <div class="row">
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@body-bg">@body-bg</label> <label for="input-@body-bg">@body-bg</label>
......
less/variables.less
+ 1
- 1
View file @ 3fb5d0bb
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
//== Scaffolding //== Scaffolding
// //
// ## Settings for some of the most global styles. //## Settings for some of the most global styles.
//** Background color for `<body>`. //** Background color for `<body>`.
@body-bg: #fff; @body-bg: #fff;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment