From 532ee082135eec9ba510d8f085add8722da5a03b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Thu, 20 Sep 2012 11:37:34 -0700
Subject: fixes #5150: add btn-group support to input groups

---
 docs/assets/css/bootstrap.css | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8206d0d53..4ce730e7b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1648,8 +1648,17 @@ select:focus:required:invalid:focus {
           border-radius: 4px 0 0 4px;
 }
 
+.input-append input + .btn-group .btn,
+.input-append select + .btn-group .btn,
+.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
 .input-append .add-on,
-.input-append .btn {
+.input-append .btn,
+.input-append .btn-group {
   margin-left: -1px;
 }
 
@@ -1668,6 +1677,14 @@ select:focus:required:invalid:focus {
           border-radius: 0;
 }
 
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
 .input-prepend.input-append .add-on:first-child,
 .input-prepend.input-append .btn:first-child {
   margin-right: -1px;
@@ -1684,6 +1701,10 @@ select:focus:required:invalid:focus {
           border-radius: 0 4px 4px 0;
 }
 
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
 input.search-query {
   padding-right: 14px;
   padding-right: 4px \9;
-- 
cgit v1.2.3