Merge branch '2.1.2-wip' into exploratory

Conflicts: docs/assets/css/bootstrap.css less/navs.less
2026-06-05 16:42:29 +03:00 · 2012-10-01 11:27:40 -07:00
parent 8da78223ff c6c1ada600
commit e6d6c7a413
7 changed files with 84 additions and 39 deletions
@@ -83,7 +83,8 @@ img {
 }

 // Prevent max-width from affecting Google Maps
-#map_canvas img {
+#map_canvas img,
+.google-maps img {
  max-width: none;
 }