Redesign project page header

6 files changed, 72 insertions, 71 deletions

diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index b60c419fb3a..ac692686bb2 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -2,7 +2,7 @@
   .controls
     - access = user_max_access_in_project(current_user.id, @project)
     - can_edit = can?(current_user, :admin_project, @project)
-    %span.dropdown.project-settings-dropdown
+    .dropdown.project-settings-dropdown
       %a.dropdown-new.btn.btn-default#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
         = icon('cog')
         = icon('caret-down')
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index cdb8d2b5e36..57c3d1b0a65 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,37 +1,37 @@
 - empty_repo = @project.empty_repo?
 .project-home-panel.cover-block.clearfix{:class => ("empty-project" if empty_repo)}
-  .project-identicon-holder
-    = project_icon(@project, alt: '', class: 'project-avatar avatar s90')
-  .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)
+  .container-fluid.container-limited
+    .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)
 
-  - if @project.description.present?
-    .cover-desc.project-home-desc
-      = markdown(@project.description, pipeline: :description)
+        - if @project.description.present?
+          .cover-desc.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
-    .split-one.count-buttons
-      = render 'projects/buttons/star'
-      = render 'projects/buttons/fork'
+        .project-repo-buttons
+          .count-buttons
+            = render 'projects/buttons/star'
+            = render 'projects/buttons/fork'
 
-    .clone-row
-      .project-clone-holder
-        = render "shared/clone_panel"
-
-      .split-repo-buttons
-        .btn-group.pull-left
-          = render "projects/buttons/download"
-          = render 'projects/buttons/dropdown'
+          .project-clone-holder
+            = render "shared/clone_panel"
 
+    .project-repo-buttons.btn-group.project-right-buttons
+      = render "projects/buttons/download"
+      = render 'projects/buttons/dropdown'
       = render 'projects/buttons/notifications'
 
 :javascript
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index 1e4c46fca2f..16b8e1cca91 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -2,7 +2,7 @@
   .btn-group
     %a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
       = icon('plus')
-    %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
+    %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
       - can_create_issue = can?(current_user, :create_issue, @project)
       - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
       - can_create_snippet = can?(current_user, :create_snippet, @project)
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
index c1e3e5b73a2..1d05da50581 100644
--- a/app/views/projects/buttons/_notifications.html.haml
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -1,11 +1,11 @@
 - if @notification_setting
   = form_for @notification_setting, url: namespace_project_notification_setting_path(@project.namespace.becomes(Namespace), @project), method: :patch, remote: true, html: { class: 'inline', id: 'notification-form' } do |f|
     = f.hidden_field :level
-    %span.dropdown
+    .dropdown
       %a.dropdown-new.btn.notifications-btn#notifications-button{href: '#', "data-toggle" => "dropdown"}
         = icon('bell')
         = notification_title(@notification_setting.level)
-        = icon('angle-down')
-      %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
+        = icon('caret-down')
+      %ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
         - NotificationSetting.levels.each do |level|
           = notification_list_item(level.first, @notification_setting)
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 74feb9e3282..61f739ad1d4 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -13,50 +13,51 @@
 = render "home_panel"
 
 .project-stats.row-content-block.second-block
-  %ul.nav
-    %li
-      = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
-        = pluralize(number_with_delimiter(@project.commit_count), 'commit')
-    %li
-      = link_to namespace_project_branches_path(@project.namespace, @project) do
-        = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
-    %li
-      = link_to namespace_project_tags_path(@project.namespace, @project) do
-        = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
-
-    %li
-      = link_to project_files_path(@project) do
-        = repository_size
-
-    - if default_project_view != 'readme' && @repository.readme
+  .container-fluid.container-limited
+    %ul.nav
       %li
-        = link_to 'Readme', readme_path(@project)
-
-    - if @repository.changelog
+        = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
+          = pluralize(number_with_delimiter(@project.commit_count), 'commit')
       %li
-        = link_to 'Changelog', changelog_path(@project)
-
-    - if @repository.license_blob
+        = link_to namespace_project_branches_path(@project.namespace, @project) do
+          = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
       %li
-        = link_to license_short_name(@project), license_path(@project)
+        = link_to namespace_project_tags_path(@project.namespace, @project) do
+          = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
 
-    - if @repository.contribution_guide
       %li
-        = link_to 'Contribution guide', contribution_guide_path(@project)
+        = link_to project_files_path(@project) do
+          = repository_size
+
+      - 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.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 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
+      - 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
 
 - if @repository.commit
   .content-block.second-block.white
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 974751d9970..84b3f44c0ad 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -5,7 +5,7 @@
     %a#clone-dropdown.clone-dropdown-btn.btn{href: '#', 'data-toggle' => 'dropdown'}
       %span
         = default_clone_protocol.upcase
-      = icon('angle-down')
+      = icon('caret-down')
     %ul.dropdown-menu.dropdown-menu-right.clone-options-dropdown
       %li
         = ssh_clone_button(project)