From 85a27a0fdaa9b1efdc984dcc4c1433b66f088815 Mon Sep 17 00:00:00 2001
From: Ina <inaloena@gmail.com>
Date: Fri, 16 Oct 2015 10:24:56 -0300
Subject: [PATCH] adjustments
---
app/views/shared/application/_footer.html.erb | 23 +++++++++++++------
app/views/welcome/account.html.erb | 8 +++----
app/views/welcome/login.html.erb | 2 +-
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index 82c9066f..683e6e4e 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -1,11 +1,20 @@
<footer>
- <div style="background-color: #1676bc;">
-
- <%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo.png', style: 'width: auto; height:200px; padding: 45px 40%;' %>
- <% end %>
-
- </div>
+ <div class="container-fluid" style="background-color: #2178F5;">
+ <header>
+ <div class="search-bar">
+ <div class="row">
+ <div class="col-md-offset-5 col-md-4">
+ <div class="logo" >
+ <%= link_to root_path do %>
+ <%= image_tag image_path("logo.png"), class: "logo",style: 'margin-top:15px;'%>
+ <h3>CONTEÚDO EDUCACIONAL</h3>
+ <% end %>
+ </div>
+ </div>
+ </div>
+ </div>
+ </header>
+</div>
<div class="main" style="background-color: #E6E6E6;">
<div class="container" style="min-height: 200px;">
diff --git a/app/views/welcome/account.html.erb b/app/views/welcome/account.html.erb
index e3bc9ae6..6b9a70af 100644
--- a/app/views/welcome/account.html.erb
+++ b/app/views/welcome/account.html.erb
@@ -30,7 +30,7 @@
<td colspan="2"><span class="pull-right"><div style="margin-bottom: 5px"><%= link_to 'Esqueci a senha', search_path, style:'color: #1676bc;'%></div></span></td>
</tr>
<tr>
- <td> Nova senha:</td><td> <input type="password" size="35" placeholder="email"></td>
+ <td> <div style="margin-bottom: 15px"> Nova senha:</div></td><td> <input type="password" size="35" placeholder="email"></td>
</tr>
<tr>
<td> Confirmar senha:</td><td> <input type="password" size="35" placeholder="email"></td>
@@ -38,7 +38,7 @@
</table>
<b>Conta</b><br/>
- <div style="margin: 5px 20px;"><%= link_to 'Deletar conta', search_path, style:'color: #FF3300;'%></div>
+ <div style="margin: 5px 25px;"><%= link_to 'Deletar conta', search_path, style:'color: #FF3300;'%></div>
</div>
</div>
@@ -46,8 +46,8 @@
</div>
</div>
<div class="col-md-4">
- <%= link_to 'Cancelar', search_path, class: "btn", style: ' width: 130px; color:white; background-color: #FF3300;' %>
- <%= link_to 'Salvar', search_path, class: "btn", style: ' width: 130px; color:white; background-color: #1676bc;' %>
+ <%= link_to 'Cancelar', search_path, class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #FF3300;' %>
+ <%= link_to 'Salvar', search_path, class: "btn", style: 'height: 35px; width: 130px; color:white; background-color: #1676bc;' %>
</div>
</div>
</div>
diff --git a/app/views/welcome/login.html.erb b/app/views/welcome/login.html.erb
index 05d42dc1..58df2d00 100644
--- a/app/views/welcome/login.html.erb
+++ b/app/views/welcome/login.html.erb
@@ -16,7 +16,7 @@
<tr>
<td>Senha:</td><td> </td>
- <td><input type="text" size="40" placeholder="senha"></td>
+ <td><input type="password" size="40" placeholder="senha"></td>
</tr>
<tr>
<td></td><td></td>
--
GitLab