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
1e783c77
Commit
1e783c77
authored
Nov 29, 2017
by
Clement Ho
Committed by
Fatih Acet
Nov 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add border for epic edit button
parent
3d20a428
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
24 deletions
+25
-24
app/assets/javascripts/issue_show/components/title.vue
app/assets/javascripts/issue_show/components/title.vue
+1
-1
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+11
-11
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-3
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-4
changelogs/unreleased-ee/border-inline-edit.yml
changelogs/unreleased-ee/border-inline-edit.yml
+5
-0
spec/javascripts/issue_show/components/title_spec.js
spec/javascripts/issue_show/components/title_spec.js
+4
-4
No files found.
app/assets/javascripts/issue_show/components/title.vue
View file @
1e783c77
...
...
@@ -79,7 +79,7 @@
v-tooltip
v-if=
"showInlineEditButton && canUpdate"
type=
"button"
class=
"btn
-blank btn-edit note-action-button
"
class=
"btn
btn-default btn-edit btn-svg
"
v-html=
"pencilIcon"
title=
"Edit title and description"
data-placement=
"bottom"
...
...
app/assets/stylesheets/framework/animations.scss
View file @
1e783c77
...
...
@@ -125,7 +125,7 @@
@include
transition
(
border-color
);
}
.note-action-button
.link-highlight
,
.note-action-button
,
.toolbar-btn
,
.dropdown-toggle-caret
{
@include
transition
(
color
);
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
1e783c77
...
...
@@ -88,17 +88,6 @@
border-color
:
$border-dark
;
color
:
$color
;
}
svg
{
path
{
fill
:
$color
;
}
use
{
stroke
:
$color
;
}
}
}
@mixin
btn-green
{
...
...
@@ -142,6 +131,13 @@
}
}
@mixin
btn-svg
{
height
:
$gl-padding
;
width
:
$gl-padding
;
top
:
0
;
vertical-align
:
text-top
;
}
.btn
{
@include
btn-default
;
@include
btn-white
;
...
...
@@ -444,3 +440,7 @@
text-decoration
:
none
;
}
}
.btn-svg
svg
{
@include
btn-svg
;
}
app/assets/stylesheets/pages/issuable.scss
View file @
1e783c77
...
...
@@ -70,14 +70,13 @@
.title
{
padding
:
0
;
margin-bottom
:
16px
;
margin-bottom
:
$gl-padding
;
border-bottom
:
0
;
}
.btn-edit
{
margin-left
:
auto
;
// Set height to match title height
height
:
2em
;
height
:
$gl-padding
*
2
;
}
// Border around images in issue and MR descriptions.
...
...
app/assets/stylesheets/pages/notes.scss
View file @
1e783c77
...
...
@@ -543,10 +543,7 @@ ul.notes {
}
svg
{
height
:
16px
;
width
:
16px
;
top
:
0
;
vertical-align
:
text-top
;
@include
btn-svg
;
}
.award-control-icon-positive
,
...
...
changelogs/unreleased-ee/border-inline-edit.yml
0 → 100644
View file @
1e783c77
---
title
:
Add border for epic edit button
merge_request
:
author
:
type
:
other
spec/javascripts/issue_show/components/title_spec.js
View file @
1e783c77
...
...
@@ -80,19 +80,19 @@ describe('Title component', () => {
});
it
(
'
should not show by default
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.
note-action-button
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.
btn-edit
'
)).
toBeNull
();
});
it
(
'
should not show if canUpdate is false
'
,
()
=>
{
vm
.
showInlineEditButton
=
true
;
vm
.
canUpdate
=
false
;
expect
(
vm
.
$el
.
querySelector
(
'
.
note-action-button
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.
btn-edit
'
)).
toBeNull
();
});
it
(
'
should show if showInlineEditButton and canUpdate
'
,
()
=>
{
vm
.
showInlineEditButton
=
true
;
vm
.
canUpdate
=
true
;
expect
(
vm
.
$el
.
querySelector
(
'
.
note-action-button
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.
btn-edit
'
)).
toBeDefined
();
});
it
(
'
should trigger open.form event when clicked
'
,
()
=>
{
...
...
@@ -100,7 +100,7 @@ describe('Title component', () => {
vm
.
canUpdate
=
true
;
Vue
.
nextTick
(()
=>
{
vm
.
$el
.
querySelector
(
'
.
note-action-button
'
).
click
();
vm
.
$el
.
querySelector
(
'
.
btn-edit
'
).
click
();
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
open.form
'
);
});
});
...
...
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