diff --git a/app/assets/stylesheets/custom_bootstrap.scss b/app/assets/stylesheets/custom_bootstrap.scss index 1dc624d1d..06af4ac55 100644 --- a/app/assets/stylesheets/custom_bootstrap.scss +++ b/app/assets/stylesheets/custom_bootstrap.scss @@ -23,7 +23,7 @@ $mini-avatar-height: 30px; } } } - .navbar-form { + .navbar-form, .navbar-toggle { margin-top: (($top-menu-height - $input-height-base) / 2); margin-bottom: (($top-menu-height - $input-height-base) / 2); } @@ -141,4 +141,8 @@ table tbody { .submenu { margin-bottom: 0; +} + +ul.nav.navbar-nav.left-border { + border-left: 1px solid #dcdcdc; } \ No newline at end of file diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a023fa618..efd104f70 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -82,4 +82,10 @@ module ProjectsHelper def participant_path(participant) participant.kind_of?(User) ? user_path(participant) : group_path(participant) end + + def fa_visibility_icon(project) + return nil unless project + image, color = project.public? ? ['unlock-alt', 'text-success fa-fw'] : ['lock', 'text-danger fa-fw'] + fa_icon(image, class: color) + end end diff --git a/app/views/home/_activity_tab.html.haml b/app/views/home/_activity_tab.html.haml index a29936c38..c8482569b 100644 --- a/app/views/home/_activity_tab.html.haml +++ b/app/views/home/_activity_tab.html.haml @@ -11,8 +11,7 @@ - current_user.projects.order(updated_at: :desc).limit(5).each do |project| %li = link_to project_path(project) do - - image, color = project.public? ? ['unlock-alt', 'text-success fa-fw'] : ['lock', 'text-danger fa-fw'] - = fa_icon(image, class: color) + = fa_visibility_icon project = project.name_with_owner %li = link_to t('layout.activity_feed.all_my_projects'), projects_path diff --git a/app/views/projects/build_lists/_submenu.html.haml b/app/views/projects/build_lists/_submenu.html.haml index 8b75f03bc..c70a14794 100644 --- a/app/views/projects/build_lists/_submenu.html.haml +++ b/app/views/projects/build_lists/_submenu.html.haml @@ -3,8 +3,11 @@ .container-fluid .navbar-header %ul.nav.navbar-nav - - if @build_list - %li= link_to @build_list.project.name, @build_list.project + - if @build_list && @build_list.project + %li + = link_to project_path(@build_list.project) do + = fa_visibility_icon @build_list.project + = @build_list.project.name_with_owner - else %li{ class: ('active' if controller_name == 'build_lists') } = link_to t('layout.projects.list_header'), build_lists_path