kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

add grey lines - adequate spacing for action buttons

Browse source
This commit is contained in:
Regis 2017-03-03 15:49:03 -07:00
parent 5d2c70b117
commit 578b2b2fc6
4 changed files with 104 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/assets/stylesheets/pages/merge_requests.scss
View file

@ -344,15 +344,54 @@
}
}
.remove-message-pipes {
ul {
margin-left: 6px;
margin-bottom: 20px;
padding-left: 0;
list-style: none;
border-left: 3px solid $border-color;
}
ul li:last-child {
margin-bottom: 0;
}
li {
height: 30px;
position: relative;
margin: -3px;
padding-bottom: 3px;
}
li span {
width: 20px;
display: inline-block;
height: 3px;
background: $border-color;
margin-right: 5px;
top: 16px;
position: relative;
}
li p {
display: inline-block;
margin: 0;
margin-bottom: -3px;
padding: 0;
position: relative;
top: 20px;
}
}
.mr-source-target {
background-color: #FAFAFA;
background-color: $gray-light;
line-height: 31px;
border-style: solid;
border-width: 1px;
border-color: $border-color;
border-top-right-radius: 10px;
border-top-left-radius: 10px;
border--radius: 0px;
padding: 10px;
margin-bottom: -1px;
}

68
app/views/projects/merge_requests/widget/_merged.html.haml
View file

@ -7,28 +7,54 @@
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
- if !@merge_request.source_branch_exists? || params[:deleted_source_branch]
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
The source branch has been removed.
.remove-message-pipes
%ul
%li
%span
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
%li
%span
%p
The source branch has been removed.
= render 'projects/merge_requests/widget/merged_buttons'
- elsif @merge_request.can_remove_source_branch?(current_user)
.remove_source_branch_widget
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
You can remove the source branch now.
.remove_source_branch_widget.remove-message-pipes
%ul
%li
%span
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
%li
%span
%p
You can remove the source branch now.
= render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true
.remove_source_branch_widget.failed.hide
%p
Failed to remove source branch '#{@merge_request.source_branch}'.
.remove_source_branch_in_progress.hide
%p
= icon('spinner spin')
Removing source branch '#{@merge_request.source_branch}'. Please wait, this page will be automatically reloaded.
.remove_source_branch_widget.failed.remove-message-pipes.hide
%ul
%li
%span
%p
Failed to remove source branch '#{@merge_request.source_branch}'.
.remove_source_branch_in_progress.remove-message-pipes.hide
%ul
%li
%span
%p
= icon('spinner spin')
Removing source branch '#{@merge_request.source_branch}'.
%li
%span
%p
Please wait, this page will be automatically reloaded.
- else
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
= render 'projects/merge_requests/widget/merged_buttons'
.remove-message-pipes
%ul
%li
%span
%p
The changes were merged into
#{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
= render 'projects/merge_requests/widget/merged_buttons'

2
app/views/projects/merge_requests/widget/_merged_buttons.haml
View file

@ -9,6 +9,6 @@
= icon('trash-o')
Remove Source Branch
- if mr_can_be_reverted
= revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "warning")
= revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "close")
- if mr_can_be_cherry_picked
= cherry_pick_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: "default")

25
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file

@ -3,17 +3,22 @@
- can_merge = @merge_request.can_be_merged_via_command_line_by?(current_user)
%h4.has-conflicts
= icon("exclamation-triangle")
This merge request contains merge conflicts
%p
= icon("exclamation-triangle")
This merge request contains merge conflicts
%p
To merge this request, resolve these conflicts
- if can_resolve && !can_resolve_in_ui
locally
or
- unless can_merge
ask someone with write access to this repository to
merge it locally.
.remove-message-pipes
%ul
%li
%span
%p
To merge this request, resolve these conflicts
- if can_resolve && !can_resolve_in_ui
locally
or
- unless can_merge
ask someone with write access to this repository to
merge it locally.
- if (can_resolve && can_resolve_in_ui) || can_merge
.btn-group