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
5f361db4
Commit
5f361db4
authored
Jun 02, 2020
by
Natalia Tepluhina
Committed by
Paul Slaughter
Jun 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added opacity transition to pins
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33493
parent
53573bde
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
10 deletions
+23
-10
app/assets/javascripts/design_management/components/design_note_pin.vue
...ascripts/design_management/components/design_note_pin.vue
+1
-1
app/assets/stylesheets/components/design_management/design.scss
...sets/stylesheets/components/design_management/design.scss
+10
-2
changelogs/unreleased/217692-design-view-highlight-focused-design-pins-follow-up.yml
...2-design-view-highlight-focused-design-pins-follow-up.yml
+5
-0
spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap
...ent/components/__snapshots__/design_note_pin_spec.js.snap
+6
-6
spec/frontend/design_management/components/design_note_pin_spec.js
...tend/design_management/components/design_note_pin_spec.js
+1
-1
No files found.
app/assets/javascripts/design_management/components/design_note_pin.vue
View file @
5f361db4
...
...
@@ -47,7 +47,7 @@ export default {
'btn-transparent comment-indicator': isNewNote,
'js-image-badge badge badge-pill': !isNewNote,
}"
class="
position-absolute
"
class="
design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center
"
type="button"
@mousedown="$emit('mousedown', $event)"
@mouseup="$emit('mouseup', $event)"
...
...
app/assets/stylesheets/components/design_management/design.scss
View file @
5f361db4
...
...
@@ -9,8 +9,16 @@
top
:
35px
;
}
.inactive
{
opacity
:
0
.5
;
.design-pin
{
transition
:
opacity
0
.5s
ease
;
&
.inactive
{
@include
gl-opacity-5
;
&
:hover
{
@include
gl-opacity-10
;
}
}
}
}
...
...
changelogs/unreleased/217692-design-view-highlight-focused-design-pins-follow-up.yml
0 → 100644
View file @
5f361db4
---
title
:
Add opacity transition to active design discussion pins
merge_request
:
33493
author
:
type
:
other
spec/frontend/design_management/components/__snapshots__/design_note_pin_spec.js.snap
View file @
5f361db4
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Design
discussions
component should match the snapshot of note when repositioning 1`] = `
exports[`Design
note pin
component should match the snapshot of note when repositioning 1`] = `
<button
aria-label="Comment form position"
class="
position-absolute
btn-transparent comment-indicator"
class="
design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center
btn-transparent comment-indicator"
style="left: 10px; top: 10px; cursor: move;"
type="button"
>
...
...
@@ -14,10 +14,10 @@ exports[`Design discussions component should match the snapshot of note when rep
</button>
`;
exports[`Design
discussions
component should match the snapshot of note with index 1`] = `
exports[`Design
note pin
component should match the snapshot of note with index 1`] = `
<button
aria-label="Comment '1' position"
class="
position-absolute
js-image-badge badge badge-pill"
class="
design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center
js-image-badge badge badge-pill"
style="left: 10px; top: 10px;"
type="button"
>
...
...
@@ -27,10 +27,10 @@ exports[`Design discussions component should match the snapshot of note with ind
</button>
`;
exports[`Design
discussions
component should match the snapshot of note without index 1`] = `
exports[`Design
note pin
component should match the snapshot of note without index 1`] = `
<button
aria-label="Comment form position"
class="
position-absolute
btn-transparent comment-indicator"
class="
design-pin gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center
btn-transparent comment-indicator"
style="left: 10px; top: 10px;"
type="button"
>
...
...
spec/frontend/design_management/components/design_note_pin_spec.js
View file @
5f361db4
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
DesignNotePin
from
'
~/design_management/components/design_note_pin.vue
'
;
describe
(
'
Design
discussions
component
'
,
()
=>
{
describe
(
'
Design
note pin
component
'
,
()
=>
{
let
wrapper
;
function
createComponent
(
propsData
=
{})
{
...
...
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