diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a38e453f6f..ae52bf9311 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -205,6 +205,10 @@ .dropdown-toggle { margin: -5px; } + + .update-mirror-button { + margin-right: -1px; + } } #notification-form { diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 2d12211c42..aefda710aa 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -19,7 +19,6 @@ Mirrored from #{link_to import_url, import_url}. = render "shared/mirror_status" - = render "shared/mirror_update_button", size: "sm" .project-repo-buttons @@ -30,6 +29,7 @@ = render "shared/clone_panel" .split-repo-buttons + = render "projects/buttons/update_mirror" = render "projects/buttons/download" = render 'projects/buttons/dropdown' diff --git a/app/views/projects/buttons/_update_mirror.html.haml b/app/views/projects/buttons/_update_mirror.html.haml new file mode 100644 index 0000000000..0eb8433bba --- /dev/null +++ b/app/views/projects/buttons/_update_mirror.html.haml @@ -0,0 +1,8 @@ +- if @project.mirror? && can?(current_user, :push_code, @project) + - size = nil unless defined?(size) && size + - if @project.updating_mirror? + %span.btn.disabled.update-mirror-button.has_tooltip{title: "Updating from mirror..."} + = icon('refresh') + - else + = link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn update-mirror-button has_tooltip", title: "Update from mirror" do + = icon('refresh') diff --git a/app/views/shared/_mirror_update_button.html.haml b/app/views/shared/_mirror_update_button.html.haml index 469f2dddee..0fb719d6b4 100644 --- a/app/views/shared/_mirror_update_button.html.haml +++ b/app/views/shared/_mirror_update_button.html.haml @@ -1,10 +1,9 @@ - if @project.mirror? && can?(current_user, :push_code, @project) - - size = nil unless defined?(size) && size - if @project.updating_mirror? - %span.btn.disabled{class: ("btn-#{size}" if size)} + %span.btn.disabled = icon('refresh') Updating… - else - = link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn #{"btn-#{size}" if size}" do + = link_to update_now_namespace_project_mirror_path(@project.namespace, @project), method: :post, class: "btn" do = icon('refresh') Update Now