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

shape header - bold correct text - border radius - white background for the rest of widget

Browse source
This commit is contained in:
Regis 2017-02-17 12:36:42 -07:00
parent b08be16598
commit 12c262c4ed
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@
*
*/
.mr-state-widget {
background: $gray-light;
color: $gl-text-color;
border: 1px solid $border-color;
border-radius: 2px;
@ -335,7 +334,16 @@
}
.mr-source-target {
background-color: #FAFAFA;
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;
}
.panel-new-merge-request {

4
app/views/projects/merge_requests/_show.html.haml
View file

@ -28,9 +28,9 @@
%li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
%li= link_to "Plain Diff", merge_request_path(@merge_request, format: :diff)
.normal
%span Request to merge
%span <b>Request to merge</b>
%span.label-branch= source_branch_with_namespace(@merge_request)
%span into
%span <b>into</b>
%span.label-branch
= link_to_if @merge_request.target_branch_exists?, @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)
- if @merge_request.open? && @merge_request.diverged_from_target_branch?