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
a3d2d273
Commit
a3d2d273
authored
Feb 04, 2021
by
Yogi
Committed by
Kushal Pandya
Feb 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI style for todo button in the issuable sidebar
parent
53654249
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
...ssets/javascripts/sidebar/components/todo_toggle/todo.vue
+1
-1
app/views/shared/issuable/_sidebar_todo.html.haml
app/views/shared/issuable/_sidebar_todo.html.haml
+1
-1
changelogs/unreleased/gl-button-issues.yml
changelogs/unreleased/gl-button-issues.yml
+5
-0
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
+1
-1
spec/frontend/sidebar/todo_spec.js
spec/frontend/sidebar/todo_spec.js
+1
-1
No files found.
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
View file @
a3d2d273
...
...
@@ -42,7 +42,7 @@ export default {
buttonClasses
()
{
return
this
.
collapsed
?
'
btn-blank btn-todo sidebar-collapsed-icon dont-change-state
'
:
'
btn btn-default btn-todo issuable-header-btn float-right
'
;
:
'
gl-button
btn btn-default btn-todo issuable-header-btn float-right
'
;
},
buttonLabel
()
{
return
this
.
isTodo
?
MARK_TEXT
:
TODO_TEXT
;
...
...
app/views/shared/issuable/_sidebar_todo.html.haml
View file @
a3d2d273
...
...
@@ -6,7 +6,7 @@
-
button_icon
=
has_todo
?
todo_button_data
[
:mark_icon
]
:
todo_button_data
[
:todo_icon
]
%button
.issuable-todo-btn.js-issuable-todo
{
type:
'button'
,
class:
(
is_collapsed
?
'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip'
:
'btn btn-default issuable-header-btn float-right'
),
class:
(
is_collapsed
?
'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip'
:
'
gl-button
btn btn-default issuable-header-btn float-right'
),
title:
button_title
,
'aria-label'
=>
button_title
,
data:
todo_button_data
}
...
...
changelogs/unreleased/gl-button-issues.yml
0 → 100644
View file @
a3d2d273
---
title
:
Apply new GitLab UI style for todo button in the issuable sidebar
merge_request
:
52779
author
:
Yogi (@yo)
type
:
other
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
View file @
a3d2d273
...
...
@@ -3,7 +3,7 @@
exports[`SidebarTodo template renders component container element with proper data attributes 1`] = `
<button
aria-label="Mark as done"
class="btn btn-default btn-todo issuable-header-btn float-right"
class="
gl-button
btn btn-default btn-todo issuable-header-btn float-right"
data-issuable-id="1"
data-issuable-type="epic"
type="button"
...
...
spec/frontend/sidebar/todo_spec.js
View file @
a3d2d273
...
...
@@ -26,7 +26,7 @@ describe('SidebarTodo', () => {
it
.
each
`
state | classes
${
false
}
|
${[
'
btn
'
,
'
btn-default
'
,
'
btn-todo
'
,
'
issuable-header-btn
'
,
'
float-right
'
]}
${
false
}
|
${[
'
gl-button
'
,
'
btn
'
,
'
btn-default
'
,
'
btn-todo
'
,
'
issuable-header-btn
'
,
'
float-right
'
]}
${
true
}
|
${[
'
btn-blank
'
,
'
btn-todo
'
,
'
sidebar-collapsed-icon
'
,
'
dont-change-state
'
]}
`
(
'
returns todo button classes for when `collapsed` prop is `$state`
'
,
({
state
,
classes
})
=>
{
createComponent
({
collapsed
:
state
});
...
...
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