Merge branch 'pr/11493'

Conflicts: dist/css/bootstrap.min.css

Merge branch 'pr/11493'
Conflicts: dist/css/bootstrap.min.css
86742285 · Mark Otto · e4848286 · 9f0da548 · 86742285 · 86742285
Commit 86742285 authored Nov 29, 2013 by Mark Otto
4 changed files
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3776,7 +3776,8 @@ input[type="button"].btn-block {
 }

 .btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group {
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
  display: block;
  float: none;
  width: 100%;

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/docs-assets/js/raw-files.js
+++ b/docs-assets/js/raw-files.js
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -147,7 +147,8 @@

 .btn-group-vertical {
  > .btn,
-  > .btn-group {
+  > .btn-group,
+  > .btn-group > .btn {
    display: block;
    float: none;
    width: 100%;