From be508e043c2a5f53b352066a1628693adfa7755e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Dec 2013 18:13:50 -0800 Subject: [PATCH 1/9] copyediting --- css.html | 2 +- javascript.html | 2 +- less/forms.less | 2 +- less/navbar.less | 2 +- less/navs.less | 2 +- less/panels.less | 2 +- less/type.less | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/css.html b/css.html index 4220b998cc..7f813df57b 100644 --- a/css.html +++ b/css.html @@ -3006,7 +3006,7 @@ a { {% endhighlight %}

Box (Drop) shadows

-

If your target audience is using the latest and greatest browsers and devices, be sure to just use the box-shadow property on it's own. If you need support for older Android (pre-v4) and iOS devices (pre-iOS 5), use of the mixin to pick up the required -webkit prefix.

+

If your target audience is using the latest and greatest browsers and devices, be sure to just use the box-shadow property on its own. If you need support for older Android (pre-v4) and iOS devices (pre-iOS 5), use the mixin to pick up the required -webkit prefix.

Be sure to use rgba() colors in your box shadows so they blend as seamlessly as possible with backgrounds.

{% highlight css %} .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { diff --git a/javascript.html b/javascript.html index d83358a397..9dcef28f83 100644 --- a/javascript.html +++ b/javascript.html @@ -2053,7 +2053,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {

The affix plugin toggles between three classes, each representing a particular state: .affix, .affix-top, and .affix-bottom. You must provide the styles for these classes yourself (independent of this plugin) to handle the actual positions.

Here's how the affix plugin works:

    -
  1. To start, the plugin adds .affix-top to indicate the element is in it's top-most position. At this point no CSS positioning is required.
    2. +
  2. To start, the plugin adds .affix-top to indicate the element is in its top-most position. At this point no CSS positioning is required.
  3. Scrolling past the element you want affixed should trigger the actual affixing. This is where .affix replaces .affix-top and sets position: fixed; (provided by Bootstrap's code CSS).
  4. If a bottom offset is defined, scrolling past that should replace .affix with .affix-bottom. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add position: absolute; when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the element from there.
diff --git a/less/forms.less b/less/forms.less index 530257499f..aefa5a462c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -265,7 +265,7 @@ input[type="checkbox"], // Feedback icon (requires .glyphicon classes) .form-control-feedback { position: absolute; - top: (@line-height-computed + 5); // Height of the `label` and it's margin + top: (@line-height-computed + 5); // Height of the `label` and its margin right: 0; display: block; width: @input-height-base; diff --git a/less/navbar.less b/less/navbar.less index d96f85e306..621772fbbf 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -212,7 +212,7 @@ // Navbar nav links // -// Builds on top of the `.nav` components with it's own modifier class to make +// Builds on top of the `.nav` components with its own modifier class to make // the nav the full height of the horizontal nav (above 768px). .navbar-nav { diff --git a/less/navs.less b/less/navs.less index e4ac144595..9e729b39fe 100644 --- a/less/navs.less +++ b/less/navs.less @@ -91,7 +91,7 @@ } } - // Active state, and it's :hover to override normal :hover + // Active state, and its :hover to override normal :hover &.active > a { &, &:hover, diff --git a/less/panels.less b/less/panels.less index 1b72cebd16..eefaf2e871 100644 --- a/less/panels.less +++ b/less/panels.less @@ -120,7 +120,7 @@ } } -// Within heading, strip any `h*` tag of it's default margins for spacing. +// Within heading, strip any `h*` tag of its default margins for spacing. .panel-title { margin-top: 0; margin-bottom: 0; diff --git a/less/type.less b/less/type.less index 9d032b2681..5373975d2f 100644 --- a/less/type.less +++ b/less/type.less @@ -126,7 +126,7 @@ cite { font-style: normal; } // For now we'll leave these alongside the text classes until v4 when we can // safely shift things around (per SemVer rules). .bg-primary { - // Given the contrast here, this is the only class to have it's color inverted + // Given the contrast here, this is the only class to have its color inverted // automatically. color: #fff; background-color: @brand-primary; From 023731b4c74cac72f55299502a34eb5ef88b8db0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Dec 2013 18:18:55 -0800 Subject: [PATCH 2/9] fix var name in example to follow JS conventions --- getting-started.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/getting-started.html b/getting-started.html index c43abe1979..4c39ebccd7 100644 --- a/getting-started.html +++ b/getting-started.html @@ -884,8 +884,8 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { {% highlight html %} From a2f7c3015eb433702163a7b307e9424816f22e7a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Dec 2013 18:45:56 -0800 Subject: [PATCH 3/9] fix typo in docs --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.html b/components.html index 4afb2cd005..8e61cf5265 100644 --- a/components.html +++ b/components.html @@ -1552,7 +1552,7 @@ base_url: "../"

Basic example

-

Place one add-on or button on either side of an input. You may also place one on both sides of an input. We do not support mutiple add-ons on a single side.

+

Place one add-on or button on either side of an input. You may also place one on both sides of an input. We do not support multiple add-ons on a single side.

@ From 4db1d69e98c58762a2d849325a8bc82a6d422fb2 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Dec 2013 19:00:37 -0800 Subject: [PATCH 4/9] simplify JS snippet slightly --- getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index 4c39ebccd7..286058ba4f 100644 --- a/getting-started.html +++ b/getting-started.html @@ -884,7 +884,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { {% highlight html %}