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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
50a00442
Commit
50a00442
authored
May 22, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '32657-fix-mr-widget-styles' into 'master'
MR widget styling fixes Closes #32657 See merge request !11591
parents
b8b0d594
563f6737
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
...uest_widget/components/states/mr_widget_ready_to_merge.js
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+14
-6
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @
50a00442
...
@@ -210,7 +210,7 @@ export default {
...
@@ -210,7 +210,7 @@ export default {
v-if="shouldShowMergeOptionsDropdown"
v-if="shouldShowMergeOptionsDropdown"
:disabled="isMergeButtonDisabled"
:disabled="isMergeButtonDisabled"
type="button"
type="button"
class="btn btn-info dropdown-toggle"
class="btn btn-
small btn-
info dropdown-toggle"
data-toggle="dropdown">
data-toggle="dropdown">
<i
<i
class="fa fa-caret-down"
class="fa fa-caret-down"
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
50a00442
...
@@ -209,8 +209,7 @@
...
@@ -209,8 +209,7 @@
}
}
}
}
.mr-widget-heading
,
.mr-widget-heading
{
.mr-widget-body
{
.btn-default.btn-xs
{
.btn-default.btn-xs
{
margin-left
:
5px
;
margin-left
:
5px
;
}
}
...
@@ -223,13 +222,17 @@
...
@@ -223,13 +222,17 @@
.btn-group
.btn
{
.btn-group
.btn
{
padding
:
5px
10px
;
padding
:
5px
10px
;
&
.dropdown-toggle
{
padding
:
5px
7px
;
}
}
}
}
}
.mr-widget-body
{
.mr-widget-body
{
h4
{
h4
{
font-weight
:
600
;
font-weight
:
bold
;
font-size
:
1
6
px
;
font-size
:
1
5
px
;
margin
:
5px
0
;
margin
:
5px
0
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
...
@@ -256,7 +259,6 @@
...
@@ -256,7 +259,6 @@
}
}
.bold
{
.bold
{
margin-left
:
5px
;
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
15px
;
font-size
:
15px
;
color
:
$gl-gray-light
;
color
:
$gl-gray-light
;
...
@@ -405,6 +407,12 @@
...
@@ -405,6 +407,12 @@
}
}
}
}
.mr-state-widget
.mr-widget-body
{
.approve-btn
{
margin-right
:
5px
;
}
}
.mr_source_commit
,
.mr_source_commit
,
.mr_target_commit
{
.mr_target_commit
{
margin-bottom
:
0
;
margin-bottom
:
0
;
...
@@ -547,7 +555,7 @@
...
@@ -547,7 +555,7 @@
p
{
p
{
float
:
left
;
float
:
left
;
padding-left
:
2
0
px
;
padding-left
:
2
1
px
;
&
:
:
before
{
&
:
:
before
{
top
:
13px
;
top
:
13px
;
...
...
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