From 1789cc7c6303c902de7a292c8f5dcf2e0e6c184d Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 8 Nov 2014 14:15:07 +0100 Subject: [PATCH] =?UTF-8?q?La=20carte=20peut=20maintenant=20=C3=AAtre=20af?= =?UTF-8?q?fich=C3=A9e=20dans=20une=20iframe,=20avec=20le=20param=C3=A8tre?= =?UTF-8?q?=20iframe=3Dtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/all.css.sass | 4 +++- app/assets/stylesheets/maps.css.sass | 5 +++++ app/controllers/maps_controller.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index fbdc5bbb..59dce85d 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -19,8 +19,10 @@ html background-color: transparent body border: none + margin: 0 + padding: 0 background-color: transparent - .region_selector, .lug_search, .formats, #banner + h2, nav, .region_selector, .lug_search, .formats, #banner display: none body diff --git a/app/assets/stylesheets/maps.css.sass b/app/assets/stylesheets/maps.css.sass index 6710d0d5..27030cad 100644 --- a/app/assets/stylesheets/maps.css.sass +++ b/app/assets/stylesheets/maps.css.sass @@ -20,3 +20,8 @@ height: 60em margin: 1.6em 2% display: inline-block + +html.iframe #map + width: 100% + max-width: 100% + +box-shadow(none) diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb index 84eb53c4..1f0b5143 100644 --- a/app/controllers/maps_controller.rb +++ b/app/controllers/maps_controller.rb @@ -6,7 +6,7 @@ class MapsController < ApplicationController def index respond_to do |format| - format.html + format.html { render layout: 'iframe' if params[:iframe] } format.json { render json: apply_scopes(Event.moderated.future.geo) } end end