From 019145251e3d16da65a4f91e7bb09a5716757aa6 Mon Sep 17 00:00:00 2001
From: Daniela Feitosa <danielafeitosa@colivre.coop.br>
Date: Wed, 14 Jan 2015 13:26:43 -0300
Subject: [PATCH] signup_welcome_screen: fixed warnings of incorrect html

---
 app/views/admin_panel/_signup_welcome_screen.html.erb | 7 +++----
 public/stylesheets/application.css                    | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin_panel/_signup_welcome_screen.html.erb b/app/views/admin_panel/_signup_welcome_screen.html.erb
index 702ef43..4ffca1a 100644
--- a/app/views/admin_panel/_signup_welcome_screen.html.erb
+++ b/app/views/admin_panel/_signup_welcome_screen.html.erb
@@ -1,11 +1,10 @@
 <div class='description'>
-  <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %><br/><br/>
+  <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
 </div>
 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
 
-<p>
 <div class='description'>
-  <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
+  <%= _('If this content is left blank, the following page will be displayed to the user:') %>
 </div>
-<p>
+
 <%= render :file => 'home/welcome', :locals => {:default_message => true} %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index af498bd..2c205d0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2835,7 +2835,8 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 .controller-admin_panel .description {
   background-color: #E6E6E6;
   border: 1px solid #CCC;
-  padding: 5px;
+  padding: 10px 5px;
+  margin-top: 10px;
 }
 
 /* ==> public/stylesheets/controller_catalog.css <== */
--
libgit2 0.21.2