diff options
| author | Tom Pietschker <[email protected]> | 2013-04-08 08:39:22 -0400 |
|---|---|---|
| committer | Tom Pietschker <[email protected]> | 2013-04-08 08:39:22 -0400 |
| commit | bd789ed158f4f8a5f4f9bab137e65d1b8cb29a28 (patch) | |
| tree | 696fec025a35101eaff5b233b06083250b8e2359 | |
| parent | a05ff7e50749e7ca0bbc5eebf3fa16d8b24198f2 (diff) | |
| parent | c2a35f1ec8c60b6207405e64351fbfaccba8c5a1 (diff) | |
| download | bootstrap-bd789ed158f4f8a5f4f9bab137e65d1b8cb29a28.tar.xz bootstrap-bd789ed158f4f8a5f4f9bab137e65d1b8cb29a28.zip | |
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
| -rw-r--r-- | docs/docs.html | 2 | ||||
| -rw-r--r-- | less/mixins.less | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/docs.html b/docs/docs.html index 4506d5ae5..0ae2198ad 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -4809,7 +4809,7 @@ For example, <code><section></code> should be wrapped as inline. </div> <h3 id="js-individual-compiled">Individual or compiled</h3> - <p>Plugins can be included individually (though some have required dependencies), or all at once. <strong>Do attempt to include both.</strong> Both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all plugins in a single file.</p> + <p>Plugins can be included individually (though some have required dependencies), or all at once. <strong>Do not attempt to include both.</strong> Both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all plugins in a single file.</p> <h3 id="js-data-attrs">Data attributes</h3> <p>You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API and should be your first consideration when using a plugin.</p> diff --git a/less/mixins.less b/less/mixins.less index 76c40df2d..49aaba876 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -155,7 +155,6 @@ -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew(@x, @y); transform: skew(@x, @y); - -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 } .translate3d(@x, @y, @z) { -webkit-transform: translate3d(@x, @y, @z); |