diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 06b298aef5652569787c6bab0a74eac984c4e35a..f95f3f9c241b3fbb1150f2d6b3aaf9f12d1a2a51 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,5 @@ + + /* * This is a manifest file that'll be compiled into application.css, which will include all the files * listed below. @@ -405,19 +407,22 @@ header { // navbar .navigation { background: $nav-grey; + text-align: center; .nav { - height: 50px; + height: 45px; h3 { - margin-top: 13px; + margin-top: 15px; + font-size: 16px; + font-weight: 300 !important; } .nav-button { min-width: 130px; height: 100%; - padding-left: 15px; - padding-right: 10px; + padding-left: 35px; + padding-right: 35px; // font-size: 20px; color: #343D3E; font-weight: 500 !important; @@ -436,7 +441,7 @@ header { width: 2px; margin-left: 3px; height: 100%; - background-color: #FFF; + background-color: #dddddd; } } } @@ -1045,8 +1050,7 @@ input.chk { .send-new-item img{ float: left; - position: absolute; - bottom: 5px; + position: relative; } .send-new-item h3{ diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb index 5d931849a8ec131f23463a27a456056504f725d1..86489177db78044d1650583bea381767497346c6 100644 --- a/app/controllers/collections_controller.rb +++ b/app/controllers/collections_controller.rb @@ -121,10 +121,11 @@ class CollectionsController < ApplicationController @groups = [ CollectionsGroup.new(title: 'Coleções Automáticas', - collections: [current_user.bookmarks]), + collections: [current_user.bookmarks.first]), CollectionsGroup.new(title: 'Coleções Adicionadas', collections: current_user.collections.includes(:owner)) ] + end # POST /collections/1/learning_object diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0a2504fed507c0c34c59f8ba4aea036f8b9fa64b..e721429a17d2d91c07125608879877053217d595 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -13,7 +13,7 @@ class UsersController < ApplicationController if @user == current_user @publishers = @user.institutions - @bookmarks = @user.bookmarks + @bookmarks = @user.bookmarks.first @groups.unshift(CollectionsGroup.new(title: 'Coleções Automáticas', collections: [@bookmarks])) end end diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb index ad78a69d06e339f27b2a0da80cc0f546ea03879f..1de38f3061c2e427718ff976272d285c612c382b 100644 --- a/app/views/shared/application/_header.html.erb +++ b/app/views/shared/application/_header.html.erb @@ -70,13 +70,9 @@ <div class="row"> <ul class="nav navbar-nav"> <li role="separator" class="divider"></li> - <% if user_signed_in? %> - <li class="nav-button"><h3><a class="nav-dropdown" data-content="collections" href="javascript:void(0);">Coleções </a></h3></li> - <% else %> - <li class="nav-button"><h3><%= link_to 'Coleções Institucionais', collections_path %> </h3></li> - <% end %> + <li class="dropdown nav-button"><h3><%= link_to 'Coleções Institucionais', collections_path %> </h3></li> <li role="separator" class="divider"></li> - <li class="dropdown nav-button"><h3><%= link_to 'Links Úteis', links_path %> </h3></li> + <li class="dropdown nav-button"><h3><%= link_to 'Links úteis', links_path %> </h3></li> <li role="separator" class="divider"></li> <li class="nav-button"><h3><%= link_to 'Sobre', about_path %></h3></li> <li role="separator" class="divider"></li> @@ -86,7 +82,7 @@ <%= link_to new_learning_object_path do %> <div class="send-new-item"> <%= image_tag "icons/Upload.png"%> - <h3>Enviar Novo Item</h3> + <h3>Enviar novo item</h3> </div> <% end %> </li>