aboutsummaryrefslogtreecommitdiff
path: root/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-24 12:17:48 -0800
committerMark Otto <[email protected]>2013-12-24 12:17:48 -0800
commit5c2dfbf33b133a5e31035df970ffa05585eba422 (patch)
tree522b5814714b2df5064e441959d515a5ea4a89a0 /css.html
parent679c7862374be9b742862923181302f76b3a8c06 (diff)
parent25390716ea2a0bf9cd476858c826775d68c2f1cf (diff)
downloadbootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.tar.xz
bootstrap-5c2dfbf33b133a5e31035df970ffa05585eba422.zip
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: docs-assets/js/raw-files.js
Diffstat (limited to 'css.html')
-rw-r--r--css.html8
1 files changed, 5 insertions, 3 deletions
diff --git a/css.html b/css.html
index 8b257fe2d..6520efdfa 100644
--- a/css.html
+++ b/css.html
@@ -3476,8 +3476,10 @@ $navbar-default-color: $light-orange;
<p>You can also import components explicitly. To start with a full list of modules copy this file from the gem:</p>
{% highlight bash %}
-cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss \
- app/assets/stylesheets/bootstrap-custom.scss
+# copy and prepend "bootstrap/" to the @import paths:
+sed 's/@import "/@import "bootstrap\//' \
+$(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.scss > \
+app/assets/stylesheets/bootstrap-custom.scss
{% endhighlight %}
<p>In your <code>application.sass</code>, replace <code>@import 'bootstrap'</code> with:</p>
@@ -3486,7 +3488,7 @@ cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.s
@import 'bootstrap-custom';
{% endhighlight %}
- <p>Comment out any modules you don't need from <code>bootstrap-custom</code>.</p>
+ <p>Comment out any components you do not want from <code>bootstrap-custom</code>.</p>
<h3 id="sass-usage-js">JavaScript</h3>