diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 17:21:31 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-29 17:21:31 +0000 |
commit | 57a49b340e0c8689024fefda53707a8f9b73efa5 (patch) | |
tree | 6feacc1d25cb413fa15c231c0b9c0e3bb5fe2b87 | |
parent | 40c3675372320febf5264061c9bcd63db2dfd13c (diff) | |
parent | 6920fd3dddf2960204545f64ca37b2e56972b2d7 (diff) | |
download | gitlab-ce-57a49b340e0c8689024fefda53707a8f9b73efa5.tar.gz |
Merge branch 'repo-buttons' into 'master'
Repo buttons
Fixes #796
Moved the star & fork button to inline with the other buttons.
See merge request !473
-rw-r--r-- | app/assets/stylesheets/generic/mobile.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 30 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 4 | ||||
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 24 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 4 |
5 files changed, 24 insertions, 45 deletions
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss index 1b0e056216f..71a1fc4493f 100644 --- a/app/assets/stylesheets/generic/mobile.scss +++ b/app/assets/stylesheets/generic/mobile.scss @@ -24,13 +24,6 @@ display: none !important; } - .project-home-panel { - .star-fork-buttons { - padding-top: 10px; - padding-right: 15px; - } - } - .project-home-links { display: none; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 6d55a5fa66e..de39fc3e9fb 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -48,9 +48,12 @@ .project-home-row { @extend .clearfix; margin-bottom: 15px; + + &.project-home-row-top { + margin-bottom: 11px; + } - .project-home-desc, - .star-fork-buttons { + .project-home-desc { font-size: 16px; line-height: 1.3; } @@ -60,23 +63,8 @@ color: #666; } - .star-fork-buttons { - float: right; - min-width: 200px; - font-weight: bold; - - .star-buttons, .fork-buttons { - float: right; - margin-left: 20px; - - a:hover { - text-decoration: none; - } - - .count { - margin-left: 5px; - } - } + .btn-action-count { + margin-left: 5px; } } @@ -87,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 7bf51b5b8e8..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' + cls = 'star-btn btn btn-sm btn-default' cls << ' disabled' unless signed_in toggle_html = content_tag('span', class: 'toggle') do @@ -120,7 +120,7 @@ module ProjectsHelper def link_to_toggle_fork out = icon('code-fork') out << ' Fork' - out << content_tag(:span, class: 'count') do + out << content_tag(:span, class: 'count btn-action-count') do @project.forks_count.to_s end end diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index a295a0d6cdc..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,31 +14,23 @@ – = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do = readme.name - .star-fork-buttons + .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' 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" 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-buttons - %span.star.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) - - else - = link_to_toggle_star('You must sign in to star a project.', false, false) + .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 .project-home-dropdown = render "dropdown" - - 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 "shared/clone_panel" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index cfa6f558dd6..9a2ddeb5900 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -87,6 +87,9 @@ - else %span.light CI provided by = 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 + = render 'projects/repositories/download_archive', split_button: true - if readme .tab-pane#tab-readme @@ -97,4 +100,3 @@ = readme.name .wiki = render_readme(readme) - |