From 91b108192c84178ec100ece41f159b68738f1a32 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 26 Mar 2015 19:38:20 +0000 Subject: Fork/Star button re-design --- app/assets/stylesheets/generic/mobile.scss | 7 ------- app/assets/stylesheets/pages/projects.scss | 22 +++------------------- app/helpers/projects_helper.rb | 4 ++-- app/views/projects/_home_panel.html.haml | 28 ++++++++++++---------------- 4 files changed, 17 insertions(+), 44 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..9ad1be41579 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -49,8 +49,7 @@ @extend .clearfix; margin-bottom: 15px; - .project-home-desc, - .star-fork-buttons { + .project-home-desc { font-size: 16px; line-height: 1.3; } @@ -60,23 +59,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; } } diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 7bf51b5b8e8..f535b01b2ec 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-primary' 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..3bb70458b16 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -14,29 +14,25 @@ – = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do = readme.name - .star-fork-buttons + + .project-home-row.hidden-xs + - if current_user && !empty_repo + .project-home-dropdown + = render "dropdown" + %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 - 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-primary' 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-primary' 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) - - .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 -- cgit v1.2.1 From 79bd8ca9895e030b20bbb7756e1583486c908386 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 27 Mar 2015 07:06:38 +0000 Subject: Changed button type --- app/helpers/projects_helper.rb | 2 +- app/views/projects/_home_panel.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f535b01b2ec..3199ff3b99a 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-primary' + cls = 'star-btn btn 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 3bb70458b16..599afe6e779 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -28,10 +28,10 @@ .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-primary' do + = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-default' do = link_to_toggle_fork - else - = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-primary' do + = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-default' do = link_to_toggle_fork - unless @project.empty_repo? - if can? current_user, :download_code, @project -- cgit v1.2.1 From 7652510c6ba5ed784506830667b94923d9eb8ca8 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Sun, 29 Mar 2015 12:23:56 +0100 Subject: Moved download button into sidebar Star and fork buttons moved up --- app/views/projects/_home_panel.html.haml | 14 +++++--------- app/views/projects/show.html.haml | 5 ++++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 599afe6e779..e0ceafc99e0 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -14,11 +14,6 @@ – = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do = readme.name - - .project-home-row.hidden-xs - - if current_user && !empty_repo - .project-home-dropdown - = render "dropdown" %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) @@ -33,8 +28,9 @@ - else = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-default' do = link_to_toggle_fork - - unless @project.empty_repo? - - if can? current_user, :download_code, @project - .pull-right.prepend-left-10 - = render 'projects/repositories/download_archive', split_button: true + + .project-home-row.hidden-xs + - if current_user && !empty_repo + .project-home-dropdown + = render "dropdown" = render "shared/clone_panel" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index cfa6f558dd6..b9d65a9bf59 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -87,6 +87,10 @@ - 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 + .pull-right.prepend-left-10 + = render 'projects/repositories/download_archive', split_button: true - if readme .tab-pane#tab-readme @@ -97,4 +101,3 @@ = readme.name .wiki = render_readme(readme) - -- cgit v1.2.1 From 6920fd3dddf2960204545f64ca37b2e56972b2d7 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Sun, 29 Mar 2015 12:56:45 +0100 Subject: Alignment fixes for repo buttons --- app/assets/stylesheets/pages/projects.scss | 8 ++++++++ app/helpers/projects_helper.rb | 2 +- app/views/projects/_home_panel.html.haml | 16 ++++++++-------- app/views/projects/show.html.haml | 3 +-- 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 @@ – = 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 -- cgit v1.2.1