diff options
| author | Mark Otto <[email protected]> | 2013-12-14 11:36:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 11:36:54 -0800 |
| commit | ecc6f4e6bc00b16fe3316d51d54aebe98b07aa0d (patch) | |
| tree | e7429fe6af607fa673fe6f5d0fac59ccd66ef99e /dist/css/bootstrap.css | |
| parent | 37b2c8a812337a6ed9324ba2e5dab9afbc5ad3ce (diff) | |
| parent | 22820d7151fa155a4e083bf6c940a52e55138735 (diff) | |
| download | bootstrap-ecc6f4e6bc00b16fe3316d51d54aebe98b07aa0d.tar.xz bootstrap-ecc6f4e6bc00b16fe3316d51d54aebe98b07aa0d.zip | |
Merge branch 'master' into pr/11868
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c956113e2..45f868ca5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3618,6 +3618,11 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-brand:focus { text-decoration: none; } +.navbar-brand > .glyphicon { + float: left; + margin-top: -2px; + margin-right: 5px; +} @media (min-width: 768px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { |