diff options
| author | Mark Otto <[email protected]> | 2012-10-01 11:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 11:27:40 -0700 |
| commit | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (patch) | |
| tree | cba5e4f18108c82b0d67298e671acd3c69b15fa7 /less | |
| parent | 8da78223ffe7922f46167e7429c40339e7bc53d2 (diff) | |
| parent | c6c1ada60074e420fa93174cb3db167faf618e2b (diff) | |
| download | bootstrap-e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516.tar.xz bootstrap-e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/navs.less
Diffstat (limited to 'less')
| -rw-r--r-- | less/reset.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/reset.less b/less/reset.less index 5223f2f74..7cbfa48f4 100644 --- a/less/reset.less +++ b/less/reset.less @@ -83,7 +83,8 @@ img { } // Prevent max-width from affecting Google Maps -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } |