Alignment fixes for repo buttons

4 files changed, 18 insertions, 11 deletions

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 9ad1be41579..de39fc3e9fb 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -48,6 +48,10 @@
   .project-home-row {
     @extend .clearfix;
     margin-bottom: 15px;
+    
+    &.project-home-row-top {
+      margin-bottom: 11px;
+    }
 
     .project-home-desc {
       font-size: 16px;
@@ -71,6 +75,10 @@
       color: inherit;
     }
   }
+  
+  .project-repo-buttons {
+    margin-top: -5px;
+  }
 }
 
 .project-home-links {
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3199ff3b99a..5ca71b14d0c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -81,7 +81,7 @@ module ProjectsHelper
   end
 
   def link_to_toggle_star(title, starred, signed_in)
-    cls = 'star-btn btn btn-default'
+    cls = 'star-btn btn btn-sm btn-default'
     cls << ' disabled' unless signed_in
 
     toggle_html = content_tag('span', class: 'toggle') do
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index e0ceafc99e0..750d3054625 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -2,7 +2,7 @@
 .project-home-panel{:class => ("empty-project" if empty_repo)}
   .project-identicon-holder
     = project_icon(@project, alt: '', class: 'avatar project-avatar')
-  .project-home-row
+  .project-home-row.project-home-row-top
     .project-home-desc
       - if @project.description.present?
         = escaped_autolink(@project.description)
@@ -14,20 +14,20 @@
         &ndash;
         = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
           = readme.name
-    %span.star.pull-right.prepend-left-10.js-toggler-container{class: @show_star ? 'on' : ''}
-      - if current_user
-        = link_to_toggle_star('Star this project.', false, true)
-        = link_to_toggle_star('Unstar this project.', true, true)
-    .pull-right.prepend-left-10
+    .pull-right.prepend-left-10.project-repo-buttons
       - unless @project.empty_repo?
         .fork-buttons
           - if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
             - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
-              = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-default' do
+              = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-sm btn-default' do
                 = link_to_toggle_fork
             - else
-              = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-default' do
+              = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-sm btn-default' do
                 = link_to_toggle_fork
+    .star.pull-right.prepend-left-10.project-repo-buttons.js-toggler-container{class: @show_star ? 'on' : ''}
+      - if current_user
+        = link_to_toggle_star('Star this project.', false, true)
+        = link_to_toggle_star('Unstar this project.', true, true)
 
   .project-home-row.hidden-xs
     - if current_user && !empty_repo
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index b9d65a9bf59..9a2ddeb5900 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -89,8 +89,7 @@
                 = link_to ci_service.title, ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
         - unless @project.empty_repo?
           - if can? current_user, :download_code, @project
-            .pull-right.prepend-left-10
-              = render 'projects/repositories/download_archive', split_button: true
+            = render 'projects/repositories/download_archive', split_button: true
 
   - if readme
     .tab-pane#tab-readme