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 /less | |
| 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 'less')
| -rw-r--r-- | less/mixins.less | 2 | ||||
| -rw-r--r-- | less/navbar.less | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/less/mixins.less b/less/mixins.less index 4bfd44904..dbe9ed4a7 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -354,7 +354,7 @@ // // Keep images from scaling beyond the width of their parents. -.img-responsive(@display: block;) { +.img-responsive(@display: block) { display: @display; max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching diff --git a/less/navbar.less b/less/navbar.less index 51e3df258..3f8698d09 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -161,6 +161,13 @@ text-decoration: none; } + // Prevent Glyphicons from increasing height of navbar + > .glyphicon { + float: left; + margin-top: -2px; + margin-right: 5px; + } + @media (min-width: @grid-float-breakpoint) { .navbar > .container &, .navbar > .container-fluid & { |