Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip

1 files changed, 86 insertions, 5 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 66002d292d..f1e0b43a57 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1253,9 +1253,8 @@ input[type="search"].input-large,
 input[type="tel"].input-large,
 input[type="color"].input-large,
 .uneditable-input.input-large {
-  padding: 11px 19px;
-  padding-right: 14px;
-  padding-left: 14px;
+  min-height: 44px;
+  padding: 10px 14px;
   font-size: 17.5px;
   border-radius: 6px;
 }
@@ -1277,6 +1276,7 @@ input[type="search"].input-small,
 input[type="tel"].input-small,
 input[type="color"].input-small,
 .uneditable-input.input-small {
+  min-height: 26px;
   padding: 2px 10px;
   font-size: 11.9px;
   border-radius: 3px;
@@ -1299,6 +1299,7 @@ input[type="search"].input-mini,
 input[type="tel"].input-mini,
 input[type="color"].input-mini,
 .uneditable-input.input-mini {
+  min-height: 26px;
   padding: 0 6px;
   font-size: 10.5px;
   border-radius: 3px;
@@ -1473,6 +1474,20 @@ select:focus:invalid:focus {
   border-radius: 0;
 }
 
+.input-group-addon.input-small,
+.input-group-btn.input-small,
+.input-group input.input-small,
+.input-group .uneditable-input.input-small {
+  border-radius: 0;
+}
+
+.input-group-addon.input-large,
+.input-group-btn.input-large,
+.input-group input.input-large,
+.input-group .uneditable-input.input-large {
+  border-radius: 0;
+}
+
 .input-group-addon,
 .input-group-btn {
   width: 1%;
@@ -1493,6 +1508,16 @@ select:focus:invalid:focus {
           box-sizing: border-box;
 }
 
+.input-group-addon.input-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.input-group-addon.input-large {
+  padding: 10px 14px;
+  font-size: 17.5px;
+}
+
 .input-group input:first-child,
 .input-group .uneditable-input:first-child,
 .input-group-addon:first-child {
@@ -1500,6 +1525,24 @@ select:focus:invalid:focus {
   border-top-left-radius: 4px;
 }
 
+.input-group input:first-child.input-small,
+.input-group .uneditable-input:first-child.input-small,
+.input-group-addon:first-child.input-small {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
+}
+
+.input-group input:first-child.input-large,
+.input-group .uneditable-input:first-child.input-large,
+.input-group-addon:first-child.input-large {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 6px;
+  border-top-left-radius: 6px;
+}
+
 .input-group-addon:first-child {
   border-right: 0;
 }
@@ -1511,6 +1554,24 @@ select:focus:invalid:focus {
   border-bottom-right-radius: 4px;
 }
 
+.input-group input:last-child.input-small,
+.input-group .uneditable-input:last-child.input-small,
+.input-group-addon:last-child.input-small {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
+.input-group input:last-child.input-large,
+.input-group .uneditable-input:last-child.input-large,
+.input-group-addon:last-child.input-large {
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
 .input-group-addon:last-child {
   border-left: 0;
 }
@@ -1543,6 +1604,16 @@ select:focus:invalid:focus {
   border-radius: 4px 0 0 4px;
 }
 
+.input-group-btn:first-child > .btn.btn-large,
+.input-group-btn.btn-group:first-child > .btn.btn-large {
+  border-radius: 6px 0 0 6px;
+}
+
+.input-group-btn:first-child > .btn.btn-small,
+.input-group-btn.btn-group:first-child > .btn.btn-small {
+  border-radius: 3px 0 0 3px;
+}
+
 .input-group-btn:last-child > .btn,
 .input-group-btn.btn-group:last-child > .btn:first-child {
   border-left: 0;
@@ -1553,6 +1624,16 @@ select:focus:invalid:focus {
   border-radius: 0 4px 4px 0;
 }
 
+.input-group-btn:last-child > .btn.btn-large,
+.input-group-btn.btn-group:last-child > .btn.btn-large {
+  border-radius: 0 6px 6px 0;
+}
+
+.input-group-btn:last-child > .btn.btn-small,
+.input-group-btn.btn-group:last-child > .btn.btn-small {
+  border-radius: 0 3px 3px 0;
+}
+
 @media screen and (min-width: 768px) {
   .form-horizontal .control-group {
     position: relative;
@@ -1627,7 +1708,7 @@ fieldset[disabled] .btn {
 }
 
 .btn-large {
-  padding: 11px 19px;
+  padding: 11px 14px;
   font-size: 17.5px;
   border-radius: 6px;
 }
@@ -3463,7 +3544,7 @@ button.close {
 
 .pagination-large > li > a,
 .pagination-large > li > span {
-  padding: 11px 19px;
+  padding: 11px 14px;
   font-size: 17.5px;
 }