From: Mark Otto Date: Mon, 1 Oct 2012 05:41:26 +0000 (-0700) Subject: run make after merge X-Git-Tag: v3.0.0-rc1~928^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da43c7c27cb08a76775ad64b5caa210630d0c2cd;p=thirdparty%2Fbootstrap.git run make after merge --- diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 825d6b51e7..0160bf1f63 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3189,7 +3189,8 @@ button.close { border-radius: 5px; } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -3201,7 +3202,8 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; }