diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 761ad5894..36af0216f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,11 +19,10 @@ = javascript_include_tag 'satisfaction' , 'satisfaction-display' %body - - flash.each do |name, msg| - = content_tag :div, msg, :id => "flash_#{name}" - %header .container + - flash.each do |name, msg| + = content_tag :div, msg, :id => "flash_#{name}" %a#diaspora_text{:href => root_path} %img{:src => '/images/diaspora_white.png'} preview diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1b3e26d33..784d4582a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -11,12 +11,13 @@ a { #flash_error, #flash_alert { z-index: 60; - position: fixed; + position: absolute; padding: 5px 8px; margin: 0; width: 400px; top: 0px; - left: 200px; } + margin-left: 230px; + color: #666666; } #flash_notice { background-color: #ccffcc; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 75a3938ed..520f4c869 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -11,12 +11,14 @@ a #flash_error, #flash_alert :z-index 60 - :position fixed + :position absolute :padding 5px 8px :margin 0 :width 400px :top 0px - :left 200px + :margin + :left 230px + :color #666 #flash_notice :background-color #CFC