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
8b24412d
Commit
8b24412d
authored
Mar 04, 2021
by
Marcel van Remmerden
Committed by
Tim Zallmann
Mar 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
De-emphasize "Comment and close" button
parent
2021dcee
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
21 deletions
+5
-21
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+0
-5
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-4
changelogs/unreleased/198562-merge-request-user-interface-encourages-accidentally-closing-the-r.yml
...-user-interface-encourages-accidentally-closing-the-r.yml
+5
-0
spec/frontend/notes/components/comment_form_spec.js
spec/frontend/notes/components/comment_form_spec.js
+0
-12
No files found.
app/assets/javascripts/notes/components/comment_form.vue
View file @
8b24412d
...
...
@@ -133,9 +133,6 @@ export default {
noteable
:
this
.
noteableDisplayName
,
});
},
buttonVariant
()
{
return
this
.
isOpen
?
'
warning
'
:
'
default
'
;
},
actionButtonClassNames
()
{
return
{
'
btn-reopen
'
:
!
this
.
isOpen
,
...
...
@@ -425,8 +422,6 @@ export default {
<gl-button
v-if=
"canToggleIssueState"
:loading=
"isToggleStateButtonLoading"
category=
"secondary"
:variant=
"buttonVariant"
:class=
"[actionButtonClassNames, 'btn-comment btn-comment-and-close']"
:disabled=
"isSubmitting"
data-testid=
"close-reopen-button"
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
8b24412d
...
...
@@ -196,10 +196,6 @@
@include
btn-orange
;
}
&
.btn-close
{
@include
btn-outline
(
$white
,
$orange-500
,
$orange-500
,
$orange-50
,
$orange-600
,
$orange-600
,
$orange-100
,
$orange-700
,
$orange-700
);
}
&
.btn-danger
{
@include
btn-red
;
}
...
...
changelogs/unreleased/198562-merge-request-user-interface-encourages-accidentally-closing-the-r.yml
0 → 100644
View file @
8b24412d
---
title
:
Deemphasize comment and close button
merge_request
:
55075
author
:
type
:
other
spec/frontend/notes/components/comment_form_spec.js
View file @
8b24412d
...
...
@@ -474,16 +474,4 @@ describe('issue_comment_form component', () => {
expect
(
findTextArea
().
exists
()).
toBe
(
false
);
});
});
describe
(
'
close/reopen button variants
'
,
()
=>
{
it
.
each
([
[
constants
.
OPENED
,
'
warning
'
],
[
constants
.
REOPENED
,
'
warning
'
],
[
constants
.
CLOSED
,
'
default
'
],
])(
'
when %s, the variant of the btn is %s
'
,
(
state
,
expected
)
=>
{
mountComponent
({
noteableData
:
{
...
noteableDataMock
,
state
}
});
expect
(
findCloseReopenButton
().
props
(
'
variant
'
)).
toBe
(
expected
);
});
});
});
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