From 639befe0e5949d58d1c77b981c5aefd97d39ec0e Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Wed, 28 Feb 2018 11:43:47 +0100 Subject: [PATCH] Position pop-up messages more cleanly --- app/views/application/_flash.html.slim | 11 ++++++----- app/views/layouts/application.html.slim | 2 +- lib/assets/stylesheets/flash.css.scss | 13 +++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/views/application/_flash.html.slim b/app/views/application/_flash.html.slim index 135adcf4..a1f7191c 100644 --- a/app/views/application/_flash.html.slim +++ b/app/views/application/_flash.html.slim @@ -1,5 +1,6 @@ -#flash.fixed_error_messages data-message-failure=t('shared.message_failure') - - %w[alert danger info notice success warning].each do |severity| - div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}" - p id="flash-#{severity}" = flash[severity] - span.fa.fa-times \ No newline at end of file +#flash-container + #flash.container.fixed_error_messages data-message-failure=t('shared.message_failure') + - %w[alert danger info notice success warning].each do |severity| + div.alert.flash class="alert-#{{'alert' => 'warning', 'notice' => 'success'}.fetch(severity, severity)}" + p id="flash-#{severity}" = flash[severity] + span.fa.fa-times diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 8bc539a7..bd78a321 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -32,8 +32,8 @@ html lang='en' li = link_to(t('shared.help.link'), '#modal-help', data: {toggle: 'modal'}) = render('session') .container data-controller=controller_name - = render('breadcrumbs') = render('flash') + = render('breadcrumbs') - if (controller_name == "exercises" && action_name == "implement") .container-fluid = yield diff --git a/lib/assets/stylesheets/flash.css.scss b/lib/assets/stylesheets/flash.css.scss index df52993a..0abb6dc9 100644 --- a/lib/assets/stylesheets/flash.css.scss +++ b/lib/assets/stylesheets/flash.css.scss @@ -1,3 +1,8 @@ +#flash-container { + position: relative; + top: -21px; +} + .flash { display: none; @@ -10,14 +15,10 @@ } .fixed_error_messages { - position: fixed; + position: absolute; z-index: 1000; - top: 20px; - left: 0; + padding: inherit; width: 100%; - padding-left: 10%; - padding-right: 10%; - padding-top: 0; }