Alignment fixes for repo buttons

This commit is contained in:
Phil Hughes 2015-03-29 12:56:45 +01:00
parent 7652510c6b
commit 6920fd3ddd
4 changed files with 18 additions and 11 deletions

View file

@ -48,6 +48,10 @@
.project-home-row { .project-home-row {
@extend .clearfix; @extend .clearfix;
margin-bottom: 15px; margin-bottom: 15px;
&.project-home-row-top {
margin-bottom: 11px;
}
.project-home-desc { .project-home-desc {
font-size: 16px; font-size: 16px;
@ -71,6 +75,10 @@
color: inherit; color: inherit;
} }
} }
.project-repo-buttons {
margin-top: -5px;
}
} }
.project-home-links { .project-home-links {

View file

@ -81,7 +81,7 @@ module ProjectsHelper
end end
def link_to_toggle_star(title, starred, signed_in) 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 cls << ' disabled' unless signed_in
toggle_html = content_tag('span', class: 'toggle') do toggle_html = content_tag('span', class: 'toggle') do

View file

@ -2,7 +2,7 @@
.project-home-panel{:class => ("empty-project" if empty_repo)} .project-home-panel{:class => ("empty-project" if empty_repo)}
.project-identicon-holder .project-identicon-holder
= project_icon(@project, alt: '', class: 'avatar project-avatar') = project_icon(@project, alt: '', class: 'avatar project-avatar')
.project-home-row .project-home-row.project-home-row-top
.project-home-desc .project-home-desc
- if @project.description.present? - if @project.description.present?
= escaped_autolink(@project.description) = escaped_autolink(@project.description)
@ -14,20 +14,20 @@
&ndash; &ndash;
= link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
= readme.name = readme.name
%span.star.pull-right.prepend-left-10.js-toggler-container{class: @show_star ? 'on' : ''} .pull-right.prepend-left-10.project-repo-buttons
- 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
- unless @project.empty_repo? - unless @project.empty_repo?
.fork-buttons .fork-buttons
- if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace - 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 - 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 = link_to_toggle_fork
- else - 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 = 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 .project-home-row.hidden-xs
- if current_user && !empty_repo - if current_user && !empty_repo

View file

@ -89,8 +89,7 @@
= link_to ci_service.title, ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink' = link_to ci_service.title, ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
- unless @project.empty_repo? - unless @project.empty_repo?
- if can? current_user, :download_code, @project - 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 - if readme
.tab-pane#tab-readme .tab-pane#tab-readme