aboutsummaryrefslogtreecommitdiff
path: root/docs/getting-started
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-01 21:54:50 -0700
committerGitHub <[email protected]>2017-05-01 21:54:50 -0700
commit8c7fe6cf147e98fb5d8096f6e6536bcb4e207586 (patch)
treed33635083f70814945e92cb17957b6c522073379 /docs/getting-started
parentca44f5b03a9707dda74e1aa3f92a1b54de3ec6d5 (diff)
parente00de46540818fa11feb6d1f0e8b0089ba56f082 (diff)
downloadbootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.tar.xz
bootstrap-8c7fe6cf147e98fb5d8096f6e6536bcb4e207586.zip
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'docs/getting-started')
-rw-r--r--docs/getting-started/build-tools.md2
-rw-r--r--docs/getting-started/introduction.md4
2 files changed, 2 insertions, 4 deletions
diff --git a/docs/getting-started/build-tools.md b/docs/getting-started/build-tools.md
index 8c5b635b3..3482bb617 100644
--- a/docs/getting-started/build-tools.md
+++ b/docs/getting-started/build-tools.md
@@ -5,7 +5,7 @@ description: Details on how to use Bootstrap's included build tools to compile s
group: getting-started
---
-Bootstrap uses [NPM scripts](https://docs.npmjs.com/misc/scripts) for its build system. Our [package.json](https://github.com/twbs/bootstrap/blob/master/package.json) includes convenient methods for working with the framework, including compiling code, running tests, and more.
+Bootstrap uses [NPM scripts](https://docs.npmjs.com/misc/scripts) for its build system. Our [package.json](https://github.com/twbs/bootstrap/blob/v4-dev/package.json) includes convenient methods for working with the framework, including compiling code, running tests, and more.
## Contents
diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md
index d70a42627..0ca845a8a 100644
--- a/docs/getting-started/introduction.md
+++ b/docs/getting-started/introduction.md
@@ -96,9 +96,7 @@ On the rare occasion you need to override it, use something like the following:
{% highlight scss %}
.selector-for-some-widget {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
+ box-sizing: content-box;
}
{% endhighlight %}