From 2900711db49a801035855ab786c40a64f0ea93dc Mon Sep 17 00:00:00 2001
From: Bootstrap's Grunt bot <twbs-grunt@users.noreply.github.com>
Date: Sun, 26 Apr 2015 04:50:34 +0000
Subject: automatic `grunt dist`

[ci skip]
---
 dist/css/bootstrap.css | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index accc2303e..b65c228c6 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2796,13 +2796,15 @@ select[multiple].input-lg {
   pointer-events: none;
 }
 .input-lg + .form-control-feedback,
-.input-group-lg + .form-control-feedback {
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
   width: 46px;
   height: 46px;
   line-height: 46px;
 }
 .input-sm + .form-control-feedback,
-.input-group-sm + .form-control-feedback {
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
   width: 30px;
   height: 30px;
   line-height: 30px;
@@ -5250,6 +5252,9 @@ a.thumbnail.active {
 .media-object {
   display: block;
 }
+.media-object.img-thumbnail {
+  max-width: none;
+}
 .media-right,
 .media > .pull-right {
   padding-left: 10px;
-- 
cgit v1.2.3