From c1ca62198aed81a69201206b74dd49728fdaf15c Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Fri, 18 Mar 2016 11:48:46 -0300
Subject: [PATCH] Big fix in footer
---
app/assets/stylesheets/application.scss | 170 ++----------------
app/views/management/users/_form.html.erb | 2 +-
app/views/shared/application/_footer.html.erb | 25 +--
.../shared/application/_footer_home.html.erb | 24 +--
app/views/shared/application/_header.html.erb | 10 +-
5 files changed, 40 insertions(+), 191 deletions(-)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ef076c00..02b3e453 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -487,8 +487,6 @@ header {
}
}
-@media only screen and (min-width: 1010px) {
-/*For Desktops*/
footer {
padding-top: 50px;
color: #FFF;
@@ -499,103 +497,21 @@ header {
min-height: 256px;
.container-height{
- min-height: 200px;
.top-padding{
padding-top: 50px;
}
}
- .center-footer{
- margin-left: auto;
- margin-right: auto;
- background: green;
- width: 980px;
- }
- .logo-footer{
- width: 18%;
-
- .logos-footer{
- height: 70px;
- }
- .ministerio-size{
- margin-left: 60px;
- }
- .fnde-size{
- height: 100px;
- margin-top: -8%;
- margin-left: 20px;
- }
- .ufpr-size{
- margin-left: 60px;
- }
- .c3sl-size{
- margin-left: 40px;
- }
- }
- }
-
- .footerbar{
- padding: 16px;
- background-color: #AAB1AD;
- }
- .footer-bar {
- color: #FFF;
- background-color: #2178F5;
-
- .logo {
- text-align: center;
- width: 165px;
- margin: 10px auto auto auto;
-
- h3 {
- margin-top: 10px;
- font-weight: 400;
- }
- a {
- color: #FFF;
- }
- }
- }
- }
-}
-
-@media only screen and (min-width: 600px) and (max-width: 1009px){
-/*For tablets*/
- footer {
- padding-top: 30px;
- color: #FFF;
-
- .main {
- background-color: #E6E6E6;
- padding: 16px 0px 0px 0px;
- min-height: 200px;
-
- .container-height{
- min-height: 140px;
- .top-padding{
- padding-top: 30px;
- }
- }
-
- .logo-footer{
- width: 2%;
- display: inline-block;
-
- .logos-footer{
- height: 40px;
- }
- .ministerio-size{
- margin-left: 120px;
- }
- .fnde-size{
- height: 60px;
- margin-top: -8%;
- margin-left: 170px;
- }
- .ufpr-size{
- margin-left: 290px;
+ .logos-footer{
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ margin-bottom: 30px;
+ img{
+ width: auto;
}
- .c3sl-size{
- margin-left: 370px;
+ .logo-footer{
+ height: 70px;
+ display: inline-block;
}
}
}
@@ -623,73 +539,9 @@ header {
}
}
}
-}
-
-@media only screen and (max-width: 599px){
-/*For Smartphones*/
- footer {
- padding-top: 20px;
- color: #FFF;
-
- .main {
- background-color: #E6E6E6;
- padding: 5px 0px 0px 0px;
- min-height: 156px;
-
- .container-height{
- min-height: 90px;
- .top-padding{
- padding-top: 10px;
- }
- }
-
- .logo-footer{
- width: 2%;
- display: inline-block;
- .logos-footer{
- height: 18px;
- }
- .ministerio-size{
- margin-left: 40px;
- }
- .fnde-size{
- height: 60px;
- margin-top: -8%;
- margin-left: 50px;
- }
- .ufpr-size{
- margin-left: 150px;
- }
- .c3sl-size{
- margin-left: 170px;
- }
- }
- }
- .footerbar{
- padding: 16px;
- background-color: #AAB1AD;
- }
- .footer-bar {
- color: #FFF;
- background-color: #2178F5;
- .logo {
- margin: 10px auto auto auto;
- text-align: center;
- width: 100px;
- h3 {
- margin-top: 5px;
- font-weight: 300;
- }
- a {
- color: #FFF;
- }
- }
- }
- }
-}
td.stars {
width: 22%;
@@ -1056,10 +908,8 @@ input.chk {
.send-new-item img{
float: left;
- position: relative;
}
.send-new-item h3{
- position: relative;
padding-left: 20px;
}
diff --git a/app/views/management/users/_form.html.erb b/app/views/management/users/_form.html.erb
index 4f8d70fd..ed16eaec 100644
--- a/app/views/management/users/_form.html.erb
+++ b/app/views/management/users/_form.html.erb
@@ -2,7 +2,7 @@
<% if @user.errors.any? %>
<div class="ls-alert-danger">
- <h2><%= pluralize(@user.errors.count, "erro") %> <%= "happened".pluralize(@user.errors.count) %>:</h2>
+ <h2><%= pluralize(@user.errors.count, "erro") %> <%= "ocorreu".pluralize(@user.errors.count) %>:</h2>
<ul>
<% @user.errors.full_messages.each do |message| %>
<li><%= message %></li>
diff --git a/app/views/shared/application/_footer.html.erb b/app/views/shared/application/_footer.html.erb
index 1f2bb8e5..4af454f8 100644
--- a/app/views/shared/application/_footer.html.erb
+++ b/app/views/shared/application/_footer.html.erb
@@ -15,35 +15,37 @@
<div class="main">
<div class="container container-height">
<div class="row top-padding">
- <div class="center-footer">
- <div class="logo-footer col-md-2">
+ <div class="col-md-12">
+ <div class="logos-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png',class:'logos-footer' %>
+ <%= image_tag 'logo_brasil.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_ministerio.png',class:'logos-footer ministerio-size' %>
+ <%= image_tag 'logo_ministerio.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'fnde.png', class:'fnde-size' %>
+ <%= image_tag 'fnde.png', class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg',class:'logos-footer ufpr-size'%>
+ <%= image_tag 'logo_ufpr.jpg',class:'logo-footer'%>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', class:'logos-footer c3sl-size'%>
+ <%= image_tag 'logo_c3.png', class:'logo-footer'%>
<% end %>
</div>
</div>
</div>
</div>
+ </div>
<div class="footerbar">
<div class="container">
@@ -54,4 +56,5 @@
</div>
</div>
</div>
+</div>
</footer>
diff --git a/app/views/shared/application/_footer_home.html.erb b/app/views/shared/application/_footer_home.html.erb
index 6ecfb250..35e3f0e0 100644
--- a/app/views/shared/application/_footer_home.html.erb
+++ b/app/views/shared/application/_footer_home.html.erb
@@ -28,35 +28,37 @@
<div class="main">
<div class="container container-height">
<div class="row top-padding">
- <div class="center-footer">
- <div class="logo-footer col-md-2">
+ <div class="col-md-12">
+ <div class="logos-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.brasil.gov.br/' do %>
- <%= image_tag 'logo_brasil.png',class:'logos-footer' %>
+ <%= image_tag 'logo_brasil.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'logo_ministerio.png',class:'logos-footer ministerio-size' %>
+ <%= image_tag 'logo_ministerio.png',class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.fnde.gov.br/' do %>
- <%= image_tag 'fnde.png', class:'fnde-size' %>
+ <%= image_tag 'fnde.png', class:'logo-footer' %>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.ufpr.br/portalufpr/' do %>
- <%= image_tag 'logo_ufpr.jpg',class:'logos-footer ufpr-size'%>
+ <%= image_tag 'logo_ufpr.jpg',class:'logo-footer'%>
<% end %>
</div>
- <div class="col-md-2 logo-footer">
+ <div class="col-md 2">
<%= link_to 'http://www.c3sl.ufpr.br/' do %>
- <%= image_tag 'logo_c3.png', class:'logos-footer c3sl-size'%>
+ <%= image_tag 'logo_c3.png', class:'logo-footer'%>
<% end %>
</div>
</div>
</div>
</div>
+</div>
<div class="footerbar">
<div class="container">
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 1de38f30..e54a1332 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -67,7 +67,6 @@
<nav class="navigation" id="menu-bar">
<div class="container">
- <div class="row">
<ul class="nav navbar-nav">
<li role="separator" class="divider"></li>
<li class="dropdown nav-button"><h3><%= link_to 'Coleções Institucionais', collections_path %> </h3></li>
@@ -79,17 +78,12 @@
<li class="nav-button"><h3><%= link_to 'Minhas Pastas', collections_me_path %></h3></li>
<li role="separator" class="divider"></li>
<li class="nav-button">
- <%= link_to new_learning_object_path do %>
- <div class="send-new-item">
- <%= image_tag "icons/Upload.png"%>
- <h3>Enviar novo item</h3>
- </div>
- <% end %>
+ <%= link_to 'Enviar novo item', new_learning_object_path %>
+ <%#= image_tag "icons/Upload.png"%>
</li>
<li role="separator" class="divider"></li>
</ul>
</div>
- </div>
</nav>
<div class="navigation-content">
<div class="container">
--
GitLab