Map no longer extends behind sidebar to better show centered points. C…

…loses #30
davidbauer · Aug 11, 2013 · e219d16 · e219d16
1 parent 146a800
commit e219d16
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/app/Resources/views/app_base.html.twig b/app/Resources/views/app_base.html.twig
@@ -3,6 +3,7 @@
     <head>
         <meta charset="UTF-8" />
         <title>{% block title %}My Town!{% endblock %}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         {% block stylesheets %}{% endblock %}
         <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}" />
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>

diff --git 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
@@ -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
@@ -88,7 +88,7 @@
       </p>
     </section>
 
-    <section class="sidebar__section branding__section">
+    <section class="sidebar__section branding__section hidden-phone">
     <ul class="branding__list hidden-phone">
       <li class="branding__item">
         <a href="http://www.letemps.ch" target="_blank"><img src="/bundles/nzzmytown/images/log_let.png" alt="Le Temps"></a>