diff options
| author | Mark Otto <[email protected]> | 2012-09-30 22:45:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-30 22:45:39 -0700 |
| commit | bbd543db53cd8c5d295db67af2bc2517d5c11f1c (patch) | |
| tree | 15b9e94bfb14becdb0fb24e95436816fe7ff6606 /docs/assets/css | |
| parent | ad96435d27de7661a158552ad088fd800fe66fe9 (diff) | |
| parent | da43c7c27cb08a76775ad64b5caa210630d0c2cd (diff) | |
| download | bootstrap-bbd543db53cd8c5d295db67af2bc2517d5c11f1c.tar.xz bootstrap-bbd543db53cd8c5d295db67af2bc2517d5c11f1c.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/getting-started.html
docs/templates/pages/getting-started.mustache
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0ab9a33b4..bcaa06ed2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3058,7 +3058,8 @@ button.close { border-radius: 5px; } -.btn-large [class^="icon-"] { +.btn-large [class^="icon-"], +.btn-large [class*=" icon-"] { margin-top: 2px; } @@ -3070,7 +3071,8 @@ button.close { border-radius: 3px; } -.btn-small [class^="icon-"] { +.btn-small [class^="icon-"], +.btn-small [class*=" icon-"] { margin-top: 0; } |