diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 19:58:23 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 19:58:23 +0000 |
commit | 09432c7f561449734e2ae298496dc0f1d7da0d6a (patch) | |
tree | b444ddf7f6f8d25aa1af899f9c1f9a41feafaec7 /app/views/projects | |
parent | e2aba30891c3deff4174df08b92817095eec38d5 (diff) | |
download | gitlab-ce-09432c7f561449734e2ae298496dc0f1d7da0d6a.tar.gz |
Add latest changes from gitlab-org/gitlab@12-8-stable-ee
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/blob/_breadcrumb.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 49 |
2 files changed, 26 insertions, 25 deletions
diff --git a/app/views/projects/blob/_breadcrumb.html.haml b/app/views/projects/blob/_breadcrumb.html.haml index e611df8df2a..810c8b9082f 100644 --- a/app/views/projects/blob/_breadcrumb.html.haml +++ b/app/views/projects/blob/_breadcrumb.html.haml @@ -17,7 +17,7 @@ - else = link_to title, project_tree_path(@project, tree_join(@ref, path)) - .tree-controls< + .tree-controls.gl-children-ml-sm-3< = render 'projects/find_file_link' -# only show normal/blame view links for text files - if blob.readable_text? diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 4d3c24aee6b..d5f7673488f 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -75,34 +75,35 @@ = link_to new_project_tag_path(@project) do #{ _('New tag') } -.tree-controls{ class: ("gl-font-size-0" if vue_file_list_enabled?) }< - = render_if_exists 'projects/tree/lock_link' - - if vue_file_list_enabled? - #js-tree-history-link.d-inline-block{ data: { history_link: project_commits_path(@project, @ref) } } - - else - = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' - - = render 'projects/find_file_link' - - - if can_collaborate || current_user&.already_forked?(@project) +.tree-controls + .d-block.d-sm-flex.flex-wrap.align-items-start.gl-children-ml-sm-3< + = render_if_exists 'projects/tree/lock_link' - if vue_file_list_enabled? - #js-tree-web-ide-link.d-inline-block + #js-tree-history-link.d-inline-block{ data: { history_link: project_commits_path(@project, @ref) } } - else - = link_to ide_edit_path(@project, @ref, @path), class: 'btn btn-default qa-web-ide-button' do + = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' + + = render 'projects/find_file_link' + + - if can_collaborate || current_user&.already_forked?(@project) + - if vue_file_list_enabled? + #js-tree-web-ide-link.d-inline-block + - else + = link_to ide_edit_path(@project, @ref, @path), class: 'btn btn-default qa-web-ide-button' do + = _('Web IDE') + - elsif can_create_mr_from_fork + = link_to '#modal-confirm-fork', class: 'btn btn-default qa-web-ide-button', data: { target: '#modal-confirm-fork', toggle: 'modal'} do = _('Web IDE') - - elsif can_create_mr_from_fork - = link_to '#modal-confirm-fork', class: 'btn btn-default qa-web-ide-button', data: { target: '#modal-confirm-fork', toggle: 'modal'} do - = _('Web IDE') - = render 'shared/confirm_fork_modal', fork_path: ide_fork_and_edit_path(@project, @ref, @path) + = render 'shared/confirm_fork_modal', fork_path: ide_fork_and_edit_path(@project, @ref, @path) - - if show_xcode_link?(@project) - .project-action-button.project-xcode.inline< - = render "projects/buttons/xcode_link" + - if show_xcode_link?(@project) + .project-action-button.project-xcode.inline< + = render "projects/buttons/xcode_link" - = render 'projects/buttons/download', project: @project, ref: @ref + = render 'projects/buttons/download', project: @project, ref: @ref - .project-clone-holder.d-block.d-md-none.mt-sm-2.mt-md-0> - = render "shared/mobile_clone_panel" + .project-clone-holder.d-none.d-md-inline-block> + = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' - .project-clone-holder.d-none.d-md-inline-block> - = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' + .project-clone-holder.d-block.d-md-none.mt-sm-2.mt-md-0.ml-sm-2> + = render "shared/mobile_clone_panel" |