Merge branch 'project-page' into 'master'

app/assets/stylesheets/pages/commits.scss

@@ -29,10 +29,6 @@
 
 .commits-feed-holder {
   float: right;
-
-  .btn {
-    padding: 4px 12px;
-  }
 }
 
 li.commit {

app/assets/stylesheets/pages/projects.scss

@@ -249,7 +249,8 @@ ul.nav.nav-projects-tabs {
 }
 
 .breadcrumb.repo-breadcrumb {
-  padding: 2px 0;
+  padding: 0;
+  line-height: 34px;
   background: white;
   border: none;
   font-size: 16px;

app/assets/stylesheets/pages/tree.scss

@@ -106,17 +106,9 @@
   }
 }
 
-.tree-download-holder .btn {
-  padding: 4px 12px;
-}
-
 .tree-ref-holder {
   float: left;
   margin-right: 15px;
-
-  .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice {
-    padding: 4px 12px;
-  }
 }
 
 .readme-holder {

app/helpers/icons_helper.rb

@@ -26,15 +26,15 @@ module IconsHelper
   end
 
   def public_icon
-    icon('globe')
+    icon('globe fw')
   end
 
   def internal_icon
-    icon('shield')
+    icon('shield fw')
   end
 
   def private_icon
-    icon('lock')
+    icon('lock fw')
   end
 
   def file_type_icon_class(type, mode, name)

app/views/projects/_aside.html.haml

 .clearfix
-  .append-bottom-20
-    = render "shared/clone_panel"
-
   - unless @project.empty_repo?
     .well
       %h4.visibility-level-label
         = visibility_level_icon(@project.visibility_level)
         = "#{visibility_level_label(@project.visibility_level).capitalize} project"
-      %ul.nav.nav-pills
-        %li= link_to pluralize(number_with_delimiter(@repository.commit_count), 'commit'), namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref)
-        %li= link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project)
-        %li= link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project)
-
-      .actions
-        = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-sm' do
-          %i.fa.fa-exchange
-          Compare code
 
-        - if can?(current_user, :download_code, @project)
-           
-          = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm'
-
-  - unless @project.empty_repo?
-    .well
-      %h4 Contribute
+      - if @repository.changelog || @repository.license || @repository.contribution_guide
         %ul.nav.nav-pills
           - if @repository.changelog
             %li.hidden-xs
               = link_to changelog_url(@project) do
+                = icon("list-alt fw")
                 Changelog
-        - if @repository.contribution_guide
-          %li.hidden-xs
-            = link_to contribution_guide_url(@project) do
-              Contribution guide
           - if @repository.license
             %li
               = link_to license_url(@project) do
+                = icon("check-circle-o fw")
                 License
+          - if @repository.contribution_guide
+            %li
+              = link_to contribution_guide_url(@project) do
+                = icon("info-circle fw")
+                Contribution guide
+
       .actions
-        = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm' do
-          %i.fa.fa-fw.fa-exclamation-circle
-          New issue
+        - if can? current_user, :write_issue, @project
+          = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm append-right-10' do
+            = icon("exclamation-circle fw")
+            New Issue
+
         - if can? current_user, :write_merge_request, @project
-           
           = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-sm", title: "New Merge Request" do
-            %i.fa.fa-plus
+            = icon("plus fw")
             New Merge Request
 
-
-
-  - if @project.archived?
-    .alert.alert-warning
-      %h4
-        %i.fa.fa-exclamation-triangle
-        Archived project!
-      %p Repository is read-only
-
-  - if @project.forked_from_project
+  - if forked_from_project = @project.forked_from_project
     .well
       %h4
+        = icon("code-fork fw")
         Forked from
         .pull-right
-          = link_to @project.forked_from_project.namespace.try(:name), project_path(@project.forked_from_project)
+          = link_to forked_from_project.namespace.try(:name), project_path(forked_from_project)
 
-
-- if version = @repository.version
+  - if version = @repository.version
     .well
       %h4
+        = icon("clock-o fw")
         Version
         .pull-right
           = link_to version_url(@project) do
             = @repository.blob_by_oid(version.id).data
 
-- @project.ci_services.each do |ci_service|
+  - @project.ci_services.each do |ci_service|
     - if ci_service.active? && ci_service.respond_to?(:builds_path)
       .well
         %h4
+          = icon("check fw")
           = ci_service.title
           .pull-right
             - if ci_service.respond_to?(:status_img_path)
@@ -83,3 +63,40 @@
                 = image_tag ci_service.status_img_path, alt: "build status"
             - else
               = link_to 'view builds', ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
+
+  - unless @project.empty_repo?
+    .well
+      %h4
+        = icon("archive fw")
+        Repository
+
+      %ul.nav.nav-pills
+        %li
+          = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
+            = icon("history fw")
+            = pluralize(number_with_delimiter(@repository.commit_count), 'commit')
+        %li
+          = link_to namespace_project_branches_path(@project.namespace, @project) do
+            = icon("code-fork fw")
+            = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch')
+        %li
+          = link_to namespace_project_tags_path(@project.namespace, @project) do
+            = icon("tags fw")
+            = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
+
+      .actions
+        = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-sm append-right-10' do
+          %i.fa.fa-exchange
+          Compare code
+
+        - if can?(current_user, :download_code, @project)
+          = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm'
+
+    = render "shared/clone_panel"
+
+  - if @project.archived?
+    .alert.alert-warning
+      %h4
+        = icon("exclamation-triangle fw")
+        Archived project!
+      %p Repository is read-only

app/views/projects/_section.html.haml

 %ul.nav.nav-tabs
   %li.active
     = link_to '#tab-activity', 'data-toggle' => 'tab' do
+      = icon("tachometer")
       Activity
   - if @repository.readme
     %li
       = link_to '#tab-readme', 'data-toggle' => 'tab' do
+        = icon("file-text-o")
         Readme
 .tab-content
   .tab-pane.active#tab-activity

app/views/projects/commits/_head.html.haml

 %ul.nav.nav-tabs
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
+      = icon("history")
       Commits
       %span.badge= number_with_precision(@repository.commit_count, precision: 0, delimiter: ',')
   = nav_link(controller: :compare) do
-    = link_to 'Compare', namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref)
+    = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref) do
+      = icon("exchange")
+      Compare
 
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
+      = icon("code-fork")
       Branches
       %span.badge.js-totalbranch-count= @repository.branches.size
 
   = nav_link(controller: :tags) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
+      = icon("tags")
       Tags
       %span.badge.js-totaltags-count= @repository.tags.length

app/views/projects/tree/show.html.haml

@@ -8,7 +8,7 @@
 
 - if can? current_user, :download_code, @project
   .tree-download-holder
-    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-sm pull-right hidden-xs hidden-sm', split_button: true
+    = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group pull-right hidden-xs hidden-sm', split_button: true
 
 #tree-holder.tree-holder.clearfix
   = render "tree", tree: @tree