Updated project header

Closes #18544

4 files changed, 85 insertions, 92 deletions

diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 540efa4780f..c935d05636d 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,41 +1,29 @@
 - empty_repo = @project.empty_repo?
-.project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)}
-  %div{ class: container_class }
-    .row
-      .project-image-container
-        = project_icon(@project, alt: '', class: 'project-avatar avatar s70')
-      .project-info
-        .cover-title.project-home-desc
-          %h1
-            = @project.name
-            %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
-              = visibility_level_icon(@project.visibility_level, fw: false)
+.project-home-panel.text-center{ class: ("empty-project" if empty_repo) }
+  %div{class: container_class }
+    = project_icon(@project, alt: @project.name, class: 'project-avatar avatar s70')
+    %h1.project-title
+      = @project.name
+      %span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}
+        = visibility_level_icon(@project.visibility_level, fw: false)
 
-        - if @project.description.present?
-          .cover-desc.project-home-desc
-            = markdown(@project.description, pipeline: :description)
+    - if @project.description.present?
+      .project-home-desc
+        = markdown(@project.description, pipeline: :description)
 
-        - if forked_from_project = @project.forked_from_project
-          .cover-desc
-            Forked from
-            = link_to project_path(forked_from_project) do
-              = forked_from_project.namespace.try(:name)
+    - if forked_from_project = @project.forked_from_project
+      .cover-desc
+        Forked from
+        = link_to project_path(forked_from_project) do
+          = forked_from_project.namespace.try(:name)
 
-        .project-repo-buttons.project-action-buttons
-          .count-buttons
-            = render 'projects/buttons/star'
-            = render 'projects/buttons/fork'
+    .project-repo-buttons.project-action-buttons
+      .count-buttons
+        = render 'projects/buttons/star'
+        = render 'projects/buttons/fork'
 
-          .project-clone-holder
-            = render "shared/clone_panel"
-
-      .project-repo-buttons.btn-group.project-right-buttons
-        - if current_user
-          .pull-left.append-right-10= render 'shared/members/access_request_buttons', source: @project
-
-        = render "projects/buttons/download"
-        = render 'projects/buttons/dropdown'
-        = render 'shared/notifications/button', notification_setting: @notification_setting
+      .project-clone-holder
+        = render "shared/clone_panel"
 
 :javascript
   new Star();
diff --git a/app/views/projects/_last_commit.html.haml b/app/views/projects/_last_commit.html.haml
index 66c30283c7a..630ae7d6140 100644
--- a/app/views/projects/_last_commit.html.haml
+++ b/app/views/projects/_last_commit.html.haml
@@ -1,11 +1,10 @@
-.project-last-commit
-  - if commit.status
-    = link_to builds_namespace_project_commit_path(commit.project.namespace, commit.project, commit), class: "ci-status ci-#{commit.status}" do
-      = ci_icon_for_status(commit.status)
-      = ci_label_for_status(commit.status)
+- if commit.status
+  = link_to builds_namespace_project_commit_path(commit.project.namespace, commit.project, commit), class: "ci-status ci-#{commit.status}" do
+    = ci_icon_for_status(commit.status)
+    = ci_label_for_status(commit.status)
 
-  = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
-  = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit), class: "commit-row-message"
-  ·
-  #{time_ago_with_tooltip(commit.committed_date, skip_js: true)} by
-  = commit_author_link(commit, avatar: true, size: 24)
+= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
+= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit), class: "commit-row-message"
+·
+#{time_ago_with_tooltip(commit.committed_date, skip_js: true)} by
+= commit_author_link(commit, avatar: true, size: 24)
diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml
index 34ad9fe2c43..a9eaed4c5f6 100644
--- a/app/views/projects/buttons/_fork.html.haml
+++ b/app/views/projects/buttons/_fork.html.haml
@@ -14,6 +14,5 @@
         Fork
       %div.count-with-arrow
         %span.arrow
-        %span.count
-          = link_to namespace_project_forks_path(@project.namespace, @project) do
-            = @project.forks_count
+        = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do
+          = @project.forks_count
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index f6e81af2638..50c252e1359 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -12,60 +12,67 @@
 = render 'projects/last_push'
 = render "home_panel"
 
-.project-stats.row-content-block.second-block
-  %div{ class: container_class }
-    %ul.nav
-      %li
-        = link_to project_files_path(@project) do
-          Files (#{repository_size})
-      %li
-        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-          #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
-      %li
-        = link_to namespace_project_branches_path(@project.namespace, @project) do
-          #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
+%nav.project-stats{ class: (container_class) }
+  %ul.nav
+    %li
+      = link_to project_files_path(@project) do
+        Files (#{repository_size})
+    %li
+      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+        #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)})
+    %li
+      = link_to namespace_project_branches_path(@project.namespace, @project) do
+        #{'Branch'.pluralize(@repository.branch_count)} (#{number_with_delimiter(@repository.branch_count)})
+    %li
+      = link_to namespace_project_tags_path(@project.namespace, @project) do
+        #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
+
+    - if default_project_view != 'readme' && @repository.readme
       %li
-        = link_to namespace_project_tags_path(@project.namespace, @project) do
-          #{'Tag'.pluralize(@repository.tag_count)} (#{number_with_delimiter(@repository.tag_count)})
+        = link_to 'Readme', readme_path(@project)
 
-      - if default_project_view != 'readme' && @repository.readme
-        %li
-          = link_to 'Readme', readme_path(@project)
+    - if @repository.changelog
+      %li
+        = link_to 'Changelog', changelog_path(@project)
 
-      - if @repository.changelog
-        %li
-          = link_to 'Changelog', changelog_path(@project)
+    - if @repository.license_blob
+      %li
+        = link_to license_short_name(@project), license_path(@project)
 
-      - if @repository.license_blob
-        %li
-          = link_to license_short_name(@project), license_path(@project)
+    - if @repository.contribution_guide
+      %li
+        = link_to 'Contribution guide', contribution_guide_path(@project)
 
-      - if @repository.contribution_guide
-        %li
-          = link_to 'Contribution guide', contribution_guide_path(@project)
+    - if current_user && can_push_branch?(@project, @project.default_branch)
+      - unless @repository.changelog
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
+            Add Changelog
+      - unless @repository.license_blob
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'LICENSE') do
+            Add License
+      - unless @repository.contribution_guide
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
+            Add Contribution guide
+      - unless @repository.gitlab_ci_yml
+        %li.missing
+          = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
+            Set Up CI
+    %li.pull-right
+      .project-repo-buttons.project-right-buttons
+        - if current_user
+          = render 'shared/members/access_request_buttons', source: @project
 
-      - if current_user && can_push_branch?(@project, @project.default_branch)
-        - unless @repository.changelog
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'CHANGELOG') do
-              Add Changelog
-        - unless @repository.license_blob
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'LICENSE') do
-              Add License
-        - unless @repository.contribution_guide
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: 'CONTRIBUTING.md', commit_message: 'Add contribution guide') do
-              Add Contribution guide
-        - unless @repository.gitlab_ci_yml
-          %li.missing
-            = link_to add_special_file_path(@project, file_name: '.gitlab-ci.yml') do
-              Set Up CI
+        .btn-group.project-repo-btn-group
+          = render "projects/buttons/download"
+          = render 'projects/buttons/dropdown'
 
+        = render 'shared/notifications/button', notification_setting: @notification_setting
 - if @repository.commit
-  .content-block.second-block.white
-    %div{ class: container_class }
-      = render 'projects/last_commit', commit: @repository.commit, project: @project
+  .project-last-commit{ class: container_class }
+    = render 'projects/last_commit', commit: @repository.commit, project: @project
 
 %div{ class: container_class }
   - if @project.archived?