Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
43bf9f42
Commit
43bf9f42
authored
Apr 16, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styles on new merge request compare page
parent
d2f8a481
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
14 deletions
+10
-14
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+1
-1
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+0
-4
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+1
-1
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+1
-1
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+1
-1
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+1
-1
app/views/projects/merge_requests/creations/_new_compare.html.haml
.../projects/merge_requests/creations/_new_compare.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework/panels.scss
View file @
43bf9f42
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
}
}
.card-head
ing
{
.card-head
er
{
padding
:
$gl-vert-padding
$gl-padding
;
padding
:
$gl-vert-padding
$gl-padding
;
line-height
:
36px
;
line-height
:
36px
;
...
...
app/assets/stylesheets/pages/commits.scss
View file @
43bf9f42
...
@@ -180,10 +180,6 @@
...
@@ -180,10 +180,6 @@
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
flex-grow
:
1
;
flex-grow
:
1
;
.merge-request-branches
&
{
flex-direction
:
column
;
}
}
}
.commit-content
{
.commit-content
{
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
43bf9f42
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
.stage-panel
{
.stage-panel
{
min-width
:
968px
;
min-width
:
968px
;
.card-head
ing
{
.card-head
er
{
padding
:
0
;
padding
:
0
;
background-color
:
transparent
;
background-color
:
transparent
;
}
}
...
...
app/assets/stylesheets/pages/groups.scss
View file @
43bf9f42
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
@include
str-truncated
(
90%
);
@include
str-truncated
(
90%
);
}
}
.dashboard
.side
.card
.card-head
ing
.input-group
{
.dashboard
.side
.card
.card-head
er
.input-group
{
.form-control
{
.form-control
{
height
:
42px
;
height
:
42px
;
...
...
app/assets/stylesheets/pages/members.scss
View file @
43bf9f42
...
@@ -167,7 +167,7 @@
...
@@ -167,7 +167,7 @@
}
}
.card
{
.card
{
.card-head
ing
{
.card-head
er
{
.badge.badge-pill
{
.badge.badge-pill
{
margin-top
:
0
;
margin-top
:
0
;
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
43bf9f42
...
@@ -499,7 +499,7 @@
...
@@ -499,7 +499,7 @@
}
}
.card-new-merge-request
{
.card-new-merge-request
{
.card-head
ing
{
.card-head
er
{
padding
:
5px
10px
;
padding
:
5px
10px
;
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
line-height
:
25px
;
line-height
:
25px
;
...
...
app/assets/stylesheets/pages/milestone.scss
View file @
43bf9f42
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
}
}
}
}
.card-head
ing
{
.card-head
er
{
line-height
:
$line-height-base
;
line-height
:
$line-height-base
;
padding
:
14px
16px
;
padding
:
14px
16px
;
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
...
...
app/assets/stylesheets/pages/settings.scss
View file @
43bf9f42
...
@@ -209,7 +209,7 @@
...
@@ -209,7 +209,7 @@
line-height
:
12px
;
line-height
:
12px
;
}
}
.card-head
ing
.label-count
{
.card-head
er
.label-count
{
color
:
$white-light
;
color
:
$white-light
;
background
:
$common-gray-dark
;
background
:
$common-gray-dark
;
}
}
...
...
app/views/projects/merge_requests/creations/_new_compare.html.haml
View file @
43bf9f42
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
project_new_merge_request_path
(
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline js-requires-input"
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
url:
project_new_merge_request_path
(
@project
),
method: :get
,
html:
{
class:
"merge-request-form form-inline js-requires-input"
}
do
|
f
|
.d-none.alert.alert-danger.mr-compare-errors
.d-none.alert.alert-danger.mr-compare-errors
.merge-request-branches.js-merge-request-new-compare.row
{
'data-target-project-url'
:
project_new_merge_request_update_branches_path
(
@source_project
),
'data-source-branch-url'
:
project_new_merge_request_branch_from_path
(
@source_project
),
'data-target-branch-url'
:
project_new_merge_request_branch_to_path
(
@source_project
)
}
.merge-request-branches.js-merge-request-new-compare.row
.col-md-12
{
'data-target-project-url'
:
project_new_merge_request_update_branches_path
(
@source_project
),
'data-source-branch-url'
:
project_new_merge_request_branch_from_path
(
@source_project
),
'data-target-branch-url'
:
project_new_merge_request_branch_to_path
(
@source_project
)
}
.col-md-6
.col-md-6
.pl-0
.card.card-new-merge-request
.card.card-new-merge-request
.card-header
.card-header
Source branch
Source branch
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
.text-center
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
.text-center
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
%ul
.list-unstyled.mr_source_commit
%ul
.list-unstyled.mr_source_commit
.col-md-6
.col-md-6
.pl-0
.card.card-new-merge-request
.card.card-new-merge-request
.card-header
.card-header
Target branch
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