From 244bef98720641e8c1a623f05c52ec7e566c562f Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Thu, 25 Feb 2016 10:44:37 -0300
Subject: [PATCH] Change header when user not signed in
---
app/assets/stylesheets/application.scss | 33 +++----
app/views/shared/application/_header.html.erb | 89 ++++++-------------
2 files changed, 44 insertions(+), 78 deletions(-)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e53ee4cca..72a808133 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -101,7 +101,7 @@ header {
.search-bar {
color: #FFF;
background-color: #2178F5;
- padding: 0px;
+ padding-bottom: 100px;
padding-top: 8px;
margin: 10px auto auto auto;
@@ -115,19 +115,20 @@ header {
text-align: center;
h3 {
margin-top: 10px;
- font-weight: 100;
+ font-weight: normal;
+ font-size: 26px;
}
a {
color: #FFF;
}
}
.logo-image {
- width: 100px;
+ max-width: 100px;
+ width: auto;
}
// accessibility
.search-accessibility {
- margin-top: 25px;
- //text-align: center;
+ margin-top: 0px;
img {
max-height: 25px;
height: auto;
@@ -182,7 +183,7 @@ header {
text-align: right;
h2, h4 {
- margin-top: 5px;
+ margin-top: -5px;
}
.media-heading {
@@ -202,28 +203,29 @@ header {
// navbar
.navigation {
- background: $nav-grey;
.nav {
- height: 50px;
+ max-height: 40px;
+ height:auto;
+ float: left;
h3 {
- margin-top: 13px;
+ margin-top: 3px;
+ font-size: 16px;
}
.nav-button {
- min-width: 130px;
+ min-width: 20px;
height: 100%;
- padding-left: 15px;
- padding-right: 10px;
- // font-size: 20px;
+ padding-left: 10px;
+ padding-right: 5px;
color: #343D3E;
font-weight: 500 !important;
a {
@extend h3;
padding: 0;
- color: #343D3E;
+ color: #FFFFFF;
}
}
@@ -233,7 +235,8 @@ header {
.divider {
width: 2px;
margin-left: 3px;
- height: 100%;
+ max-height: 100%;
+ height: auto;
background-color: #FFF;
}
}
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 670465f41..28f2f10f6 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -1,5 +1,4 @@
<header>
-
<% Feature.with(:barra_brasil) do %>
<div class="barra-brasil">
<div class="container">
@@ -15,13 +14,28 @@
</div>
</div>
<% end %>
-
+ <% if user_signed_in? %>
+ <%else%>
<div class="search-bar">
<div class="container">
<div class="row">
-
<div class="col-md-12 status-text">
- <div class="col-md-10">
+ <div class="col-md-6">
+ <nav class="navigation" id="menu-bar">
+ <ul class="nav navbar-nav">
+ <li class="nav-button"><h3><a class="nav-dropdown" data-content="collections" href="javascript:void(0);">Coleções </a></h3></li>
+ <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="links" href="javascript:void(0);">Links
+ úteis </a></h3></li>
+ <li class="nav-button"><h3>
+ <a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre </a>
+ </h3></li>
+ <li class="nav-button"><h3>
+ <%= link_to "Enviar Novo Item", new_learning_object_path, style: "color: #FFFFFF" %>
+ </h3></li>
+ </ul>
+ </nav>
+ </div>
+ <div class="col-md-4">
<div class="search-accessibility">
<%= image_tag 'fonte_mais.png', onclick: 'fontSize.resizeText(1)' %>
<%= image_tag 'fonte_inicial.png', onclick: 'fontSize.resizeText(0)' %>
@@ -29,27 +43,19 @@
<%= image_tag 'contraste.png', onclick: 'contrast.change()' %>
</div>
</div>
- <% if user_signed_in? %>
- <div class="media">
- <div class="media-body">
- <h2 class="media-heading"><%= link_to current_user.name.split(" ").first, me_users_path %></h2>
- <h4><%= link_to 'sair', destroy_user_session_path, method: 'delete', class: "quit-link" %></h4>
- </div>
- <div class="media-right">
- <a href="#">
- <%=link_to( image_tag(current_user.avatar.url(:thumb), :class=>"user-image", alt: "Foto do usuário"),me_users_path) %>
- </a>
- </div>
- </div>
- <% else %>
+ <div class="col-md-2">
<div class="media">
<div class="media-body">
<h2 class="media-heading"><%= link_to 'entre', new_user_session_path %></h2>
<h4>ou <%= link_to 'cadastre-se', new_user_registration_path, class: "register-link" %></h4>
</div>
</div>
- <% end %>
</div>
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
<div class="col-md-11">
<div class="logo-container">
<div class="logo">
@@ -74,52 +80,9 @@
</div>
</form>
</div>
-
</div>
-
-
-
- </div>
- </div>
- </div>
-
- <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="nav-button"><h3><a class="nav-dropdown" data-content="collections" href="javascript:void(0);">Coleções <span class="caret"/></a></h3></li>
- <li role="separator" class="divider"></li>
- <li class="dropdown nav-button"><h3><a class="nav-dropdown" data-content="links" href="javascript:void(0);">Links
- úteis <span class="caret"/></a></h3></li>
- <li role="separator" class="divider"></li>
- <li class="nav-button"><h3>
- <a class="nav-dropdown" data-content="about" href="javascript:void(0);">Sobre <span class="caret"/></a>
- </h3></li>
- <li role="separator" class="divider"></li>
- <li class="nav-button"><h3>
- <%= link_to "Enviar Novo Item", new_learning_object_path, style: "color: #2178F5" %>
- </h3></li>
- <li role="separator" class="divider"></li>
- </ul>
</div>
</div>
- </nav>
- <div class="navigation-content">
- <div class="container">
- <div class="row">
- <a class="navigation-content-close pull-right" aria-label="Close" href="javascript:void(0);">
- <h3><span aria-hidden="true">×</span></h3></a>
- </div>
- <div class="navigation-content-collections">
- <%= render 'shared/application/collections' %>
- </div>
- <div class="navigation-content-links">
- <%= render 'shared/application/links' %>
- </div>
- <div class="navigation-content-about">
- <%= render 'shared/application/about' %>
- </div>
- </div>
- </div>
+ </ div>
+ <%end%>
</header>
--
GitLab