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
4de1fc1f
Commit
4de1fc1f
authored
3 years ago
by
Jacques Erasmus
Committed by
Miguel Rincon
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix approvals widget alignment issues
Fixed alignment issues for the approvals wiget
parent
99b061be
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue
..._request_widget/components/approvals/approvals_footer.vue
+2
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
...ge_request_widget/components/approvals/approvals_list.vue
+3
-3
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approved_icon.vue
...rge_request_widget/components/approvals/approved_icon.vue
+4
-2
ee/changelogs/unreleased/280538-fix-approvals-widget-alignment.yml
...logs/unreleased/280538-fix-approvals-widget-alignment.yml
+5
-0
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue
View file @
4de1fc1f
...
...
@@ -67,10 +67,11 @@ export default {
<
template
>
<div>
<div
class=
"mr-widget-extension d-flex align-items-center pl-3"
>
<div
class=
"mr-widget-extension d-flex align-items-center pl-3
gl-py-3
"
>
<!-- TODO: simplify button classes once https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1029 is completed -->
<gl-button
class=
"gl-mr-3"
size=
"small"
:class=
"
{ 'gl-shadow-none!': shouldShowLoadingSpinner }"
:aria-label="ariaLabel"
:loading="shouldShowLoadingSpinner"
...
...
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_list.vue
View file @
4de1fc1f
...
...
@@ -99,7 +99,7 @@ export default {
class=
"d-none"
>
<th
class=
"w-0"
></th>
<th
class=
"w-25"
>
{{
s__
(
'
MRApprovals|Approvers
'
)
}}
</th>
<th
class=
"w-25
gl-pl-0!
"
>
{{
s__
(
'
MRApprovals|Approvers
'
)
}}
</th>
<th
class=
"w-50"
></th>
<th>
{{
s__
(
'
MRApprovals|Approvals
'
)
}}
</th>
<th
v-if=
"glFeatures.approvalsCommentedBy"
>
{{
s__
(
'
MRApprovals|Commented by
'
)
}}
</th>
...
...
@@ -114,8 +114,8 @@ export default {
</td>
</tr>
<tr
v-for=
"rule in rules"
:key=
"rule.id"
>
<td
class=
"w-0
"
><approved-icon
:is-approved=
"rule.approved"
/></td>
<td
:colspan=
"rule.rule_type === $options.ruleTypeAnyApprover ? 2 : 1"
>
<td
class=
"w-0
gl-pr-4!"
><approved-icon
class=
"gl-pl-2"
:is-approved=
"rule.approved"
/></td>
<td
:colspan=
"rule.rule_type === $options.ruleTypeAnyApprover ? 2 : 1"
class=
"gl-pl-0!"
>
<div
:class=
"glFeatures.approvalsCommentedBy ? 'd-md-block' : 'd-sm-block'"
class=
"d-none js-name"
...
...
This diff is collapsed.
Click to expand it.
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approved_icon.vue
View file @
4de1fc1f
...
...
@@ -15,6 +15,8 @@ export default {
</
script
>
<
template
>
<div>
<gl-icon
v-if=
"isApproved"
name=
"mobile-issue-close"
class=
"text-success"
:size=
"16"
/>
<div
v-else
class=
"square s16"
></div>
</div>
</
template
>
This diff is collapsed.
Click to expand it.
ee/changelogs/unreleased/280538-fix-approvals-widget-alignment.yml
0 → 100644
View file @
4de1fc1f
---
title
:
Fix approvals widget alignment issues
merge_request
:
53213
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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