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
96d10213
Commit
96d10213
authored
Aug 05, 2019
by
Marcel van Remmerden
Committed by
Clement Ho
Aug 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Make status icon in merge widget borderless"
This reverts commit c3751046d217008404a0bd371e59d6ffd6734923.
parent
d2aeae58
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
19 deletions
+15
-19
app/assets/javascripts/reports/components/report_section.vue
app/assets/javascripts/reports/components/report_section.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
...merge_request_widget/components/mr_widget_status_icon.vue
+7
-4
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+2
-14
changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml
...logs/unreleased/64831-add-padding-to-merged-by-widget.yml
+5
-0
No files found.
app/assets/javascripts/reports/components/report_section.vue
View file @
96d10213
...
...
@@ -166,7 +166,7 @@ export default {
<section
class=
"media-section"
>
<div
class=
"media"
>
<status-icon
:status=
"statusIconName"
:size=
"24"
/>
<div
class=
"media-body d-flex flex-align-self-center
prepend-left-default
"
>
<div
class=
"media-body d-flex flex-align-self-center"
>
<span
class=
"js-code-text code-text"
>
{{
headerText
}}
<slot
:name=
"slotName"
></slot>
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
View file @
96d10213
...
...
@@ -32,10 +32,13 @@ export default {
};
</
script
>
<
template
>
<div
class=
"d-flex widget-status-icon"
>
<div
v-if=
"isLoading"
class=
"mr-widget-icon"
><gl-loading-icon
size=
"sm"
/></div>
<ci-icon
v-else
:status=
"statusObj"
:size=
"24"
/>
<div
class=
"d-flex align-self-start"
>
<div
class=
"square s24 h-auto d-flex-center append-right-default"
>
<div
v-if=
"isLoading"
class=
"mr-widget-icon"
>
<gl-loading-icon
size=
"sm"
/>
</div>
<ci-icon
v-else
:status=
"statusObj"
:size=
"24"
/>
</div>
<button
v-if=
"showDisabledButton"
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
96d10213
...
...
@@ -88,7 +88,7 @@
}
.mr-widget-info
{
padding-left
:
$gl-padding
-50
-
$gl-padding-32
;
padding-left
:
$gl-padding
;
padding-right
:
$gl-padding
;
}
...
...
@@ -262,23 +262,11 @@
}
}
.widget-status-icon
{
align-self
:
flex-start
;
button
{
margin-left
:
$gl-padding
;
}
}
.mr-widget-body
{
line-height
:
28px
;
@include
clearfix
;
button
{
margin-left
:
$gl-padding
;
}
.approve-btn
{
margin-right
:
5px
;
}
...
...
@@ -527,7 +515,7 @@
}
.mr-links
{
padding-left
:
$status-icon-size
+
$gl-btn-padding
;
padding-left
:
$
gl-padding-8
+
$
status-icon-size
+
$gl-btn-padding
;
&
:last-child
{
padding-bottom
:
$gl-padding
;
...
...
changelogs/unreleased/64831-add-padding-to-merged-by-widget.yml
0 → 100644
View file @
96d10213
---
title
:
Add space to "merged by" widget
merge_request
:
30972
author
:
type
:
fixed
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