Commit 40bddfec authored by Paul Slaughter's avatar Paul Slaughter

Merge branch '217692-design-view-highlight-focused-design-pins-follow-up' into 'master'

Resolve "Design view highlight focused design pins follow-up"

See merge request gitlab-org/gitlab!33493
parents c77700ce 5f361db4
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
'btn-transparent comment-indicator': isNewNote, 'btn-transparent comment-indicator': isNewNote,
'js-image-badge badge badge-pill': !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" type="button"
@mousedown="$emit('mousedown', $event)" @mousedown="$emit('mousedown', $event)"
@mouseup="$emit('mouseup', $event)" @mouseup="$emit('mouseup', $event)"
......
...@@ -9,8 +9,16 @@ ...@@ -9,8 +9,16 @@
top: 35px; top: 35px;
} }
.inactive { .design-pin {
opacity: 0.5; transition: opacity 0.5s ease;
&.inactive {
@include gl-opacity-5;
&:hover {
@include gl-opacity-10;
}
}
} }
} }
......
---
title: Add opacity transition to active design discussion pins
merge_request: 33493
author:
type: other
// Jest Snapshot v1, https://goo.gl/fbAQLP // 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 <button
aria-label="Comment form position" 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;" style="left: 10px; top: 10px; cursor: move;"
type="button" type="button"
> >
...@@ -14,10 +14,10 @@ exports[`Design discussions component should match the snapshot of note when rep ...@@ -14,10 +14,10 @@ exports[`Design discussions component should match the snapshot of note when rep
</button> </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 <button
aria-label="Comment '1' position" 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;" style="left: 10px; top: 10px;"
type="button" type="button"
> >
...@@ -27,10 +27,10 @@ exports[`Design discussions component should match the snapshot of note with ind ...@@ -27,10 +27,10 @@ exports[`Design discussions component should match the snapshot of note with ind
</button> </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 <button
aria-label="Comment form position" 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;" style="left: 10px; top: 10px;"
type="button" type="button"
> >
......
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import DesignNotePin from '~/design_management/components/design_note_pin.vue'; import DesignNotePin from '~/design_management/components/design_note_pin.vue';
describe('Design discussions component', () => { describe('Design note pin component', () => {
let wrapper; let wrapper;
function createComponent(propsData = {}) { function createComponent(propsData = {}) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment