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
e1401923
Commit
e1401923
authored
Aug 25, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update issue edit button to gl-button
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40438
parent
c6a57cc1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
18 deletions
+16
-18
app/assets/javascripts/issue_show/components/title.vue
app/assets/javascripts/issue_show/components/title.vue
+10
-17
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-1
changelogs/unreleased/229313-update-issue-edit-button.yml
changelogs/unreleased/229313-update-issue-edit-button.yml
+5
-0
No files found.
app/assets/javascripts/issue_show/components/title.vue
View file @
e1401923
<
script
>
<
script
>
/* eslint-disable vue/no-v-html */
/* eslint-disable vue/no-v-html */
import
{
GlButton
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
animateMixin
from
'
../mixins/animate
'
;
import
animateMixin
from
'
../mixins/animate
'
;
import
eventHub
from
'
../event_hub
'
;
import
eventHub
from
'
../event_hub
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
{
spriteIcon
}
from
'
../../lib/utils/common_utils
'
;
export
default
{
export
default
{
components
:
{
GlButton
,
},
directives
:
{
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
},
mixins
:
[
animateMixin
],
mixins
:
[
animateMixin
],
props
:
{
props
:
{
...
@@ -41,11 +43,6 @@ export default {
...
@@ -41,11 +43,6 @@ export default {
titleEl
:
document
.
querySelector
(
'
title
'
),
titleEl
:
document
.
querySelector
(
'
title
'
),
};
};
},
},
computed
:
{
pencilIcon
()
{
return
spriteIcon
(
'
pencil
'
,
'
link-highlight
'
);
},
},
watch
:
{
watch
:
{
titleHtml
()
{
titleHtml
()
{
this
.
setPageTitle
();
this
.
setPageTitle
();
...
@@ -76,17 +73,13 @@ export default {
...
@@ -76,17 +73,13 @@ export default {
dir="auto"
dir="auto"
v-html="titleHtml"
v-html="titleHtml"
>
</h2>
>
</h2>
<button
<
gl-
button
v-if=
"showInlineEditButton && canUpdate"
v-if=
"showInlineEditButton && canUpdate"
v-tooltip
v-gl-tooltip
.
bottom
type=
"button"
icon=
"pencil"
class=
"btn btn-default btn-edit btn-svg js-issuable-edit
class=
"btn-edit js-issuable-edit qa-edit-button"
qa-edit-button"
title=
"Edit title and description"
title=
"Edit title and description"
data-placement=
"bottom"
data-container=
"body"
@
click=
"edit"
@
click=
"edit"
v-html=
"pencilIcon"
/>
></button>
</div>
</div>
</
template
>
</
template
>
app/assets/stylesheets/pages/issuable.scss
View file @
e1401923
...
@@ -50,6 +50,7 @@
...
@@ -50,6 +50,7 @@
.title-container
{
.title-container
{
display
:
flex
;
display
:
flex
;
align-items
:
flex-start
;
}
}
.title
{
.title
{
...
@@ -65,7 +66,6 @@
...
@@ -65,7 +66,6 @@
.btn-edit
{
.btn-edit
{
margin-left
:
auto
;
margin-left
:
auto
;
height
:
$gl-padding
*
2
;
}
}
.emoji-block
{
.emoji-block
{
...
...
changelogs/unreleased/229313-update-issue-edit-button.yml
0 → 100644
View file @
e1401923
---
title
:
Update issue edit button to gl-button
merge_request
:
40438
author
:
type
:
changed
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