From e219d1631af97f202d984280b7bc3143f18e4de7 Mon Sep 17 00:00:00 2001 From: Peter Gassner Date: Sun, 11 Aug 2013 16:00:35 +0200 Subject: [PATCH] Map no longer extends behind sidebar to better show centered points. Closes #30 --- app/Resources/views/app_base.html.twig | 1 + .../Resources/public/css/components/map.css | 10 +++++----- .../Resources/public/css/components/media.css | 9 ++++++++- .../Resources/views/Default/index.html.twig | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Resources/views/app_base.html.twig b/app/Resources/views/app_base.html.twig index 777ff27..3b15966 100644 --- a/app/Resources/views/app_base.html.twig +++ b/app/Resources/views/app_base.html.twig @@ -3,6 +3,7 @@ {% block title %}My Town!{% endblock %} + {% block stylesheets %}{% endblock %} diff --git a/src/NZZ/MyTownBundle/Resources/public/css/components/map.css b/src/NZZ/MyTownBundle/Resources/public/css/components/map.css index 8ac7191..08ff47c 100644 --- a/src/NZZ/MyTownBundle/Resources/public/css/components/map.css +++ b/src/NZZ/MyTownBundle/Resources/public/css/components/map.css @@ -2,12 +2,12 @@ * MAP * Styling for the map */ - #map{ - height: 100%; - width: 100%; +#map{ + display: block; + height:auto; padding: 0; - margin: 0; - position: relative; + margin: 0 0 0 400px; + position:absolute; top:0; right:0; bottom:0; left:0; z-index: 100; } .leaflet-container { diff --git a/src/NZZ/MyTownBundle/Resources/public/css/components/media.css b/src/NZZ/MyTownBundle/Resources/public/css/components/media.css index 5964f8e..ae49cf8 100644 --- a/src/NZZ/MyTownBundle/Resources/public/css/components/media.css +++ b/src/NZZ/MyTownBundle/Resources/public/css/components/media.css @@ -1,5 +1,12 @@ /* Landscape phone to portrait tablet */ -@media (max-width: 767px) { +@media (max-width: 767px) { + #map{ + display: block; + position: relative; + margin: 0; + height:100%; + width: 100%; + } .span-sidebar-left{ margin-left: 0; } diff --git a/src/NZZ/MyTownBundle/Resources/views/Default/index.html.twig b/src/NZZ/MyTownBundle/Resources/views/Default/index.html.twig index 614f5e7..929a823 100644 --- a/src/NZZ/MyTownBundle/Resources/views/Default/index.html.twig +++ b/src/NZZ/MyTownBundle/Resources/views/Default/index.html.twig @@ -88,7 +88,7 @@

-
+
  • Le Temps