BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
12c262c4
Commit
12c262c4
authored
Feb 17, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shape header - bold correct text - border radius - white background for the rest of widget
parent
b08be165
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+9
-1
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
12c262c4
...
...
@@ -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
{
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
12c262c4
...
...
@@ -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?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment