run make after merge

da43c7c2 · Mark Otto · 40a8a93b · da43c7c2
Commit da43c7c2 authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- 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;
 }