Merge branch 'v4' into v4-dev

70e4c720 · Mark Otto · d211654e · b3808f83 · 70e4c720 · 70e4c720
Commit 70e4c720 authored 9 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 4 deletions
+5 -4
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2271,7 +2271,7 @@ fieldset[disabled] .btn {
  opacity: .65;
 }
-a.btn.disaabled,
+a.btn.disabled,
 fieldset[disabled] a.btn {
  pointer-events: none;
 }

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/dist/css/bootstrap.min.css.map
+++ b/dist/css/bootstrap.min.css.map
--- a/docs/CNAME
+++ b/docs/CNAME
+v4-alpha.getbootstrap.com
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -2271,7 +2271,7 @@ fieldset[disabled] .btn {
  opacity: .65;
 }
-a.btn.disaabled,
+a.btn.disabled,
 fieldset[disabled] a.btn {
  pointer-events: none;
 }

--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/docs/dist/css/bootstrap.min.css.map
+++ b/docs/dist/css/bootstrap.min.css.map