-
Notifications
You must be signed in to change notification settings - Fork 92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Change Prev/next links to buttons #2695
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -155,14 +155,14 @@ | |||||
</Actions> | ||||||
|
||||||
<!-- Close modal --> | ||||||
<Actions v-if="canClose && !closeButtonContained" class="header-close"> | ||||||
<ActionButton @click="close"> | ||||||
<template #icon> | ||||||
<Close :size="iconSize" /> | ||||||
</template> | ||||||
{{ t('Close') }} | ||||||
</ActionButton> | ||||||
</Actions> | ||||||
<ButtonVue v-if="canClose && !closeButtonContained" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
suggestion (non-blocking): Rename ButtonVue to Button where it's used There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It was used like this before. Don't know why. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When there are regular |
||||||
type="tertiary" | ||||||
class="header-close" | ||||||
:aria-label="closeButtonAriaLabel"> | ||||||
<template #icon> | ||||||
<Close :size="iconSize" /> | ||||||
</template> | ||||||
</ButtonVue> | ||||||
</div> | ||||||
</div> | ||||||
</transition> | ||||||
|
@@ -178,20 +178,18 @@ | |||||
@mousedown.self="close"> | ||||||
<!-- Navigation button --> | ||||||
<transition name="fade-visibility"> | ||||||
<a v-show="hasPrevious" | ||||||
<ButtonVue v-show="hasPrevious" | ||||||
type="tertiary-no-background" | ||||||
class="prev" | ||||||
href="#" | ||||||
:class="{ | ||||||
invisible: !hasPrevious | ||||||
}" | ||||||
@click.prevent.stop="previous"> | ||||||
<span class="icon-previous"> | ||||||
:aria-label="prevButtonAriaLabel" | ||||||
@click="previous"> | ||||||
<template #icon> | ||||||
<ChevronLeft :size="40" /> | ||||||
<span class="hidden-visually"> | ||||||
{{ t('Previous') }} | ||||||
</span> | ||||||
</span> | ||||||
</a> | ||||||
</template> | ||||||
</ButtonVue> | ||||||
</transition> | ||||||
|
||||||
<!-- Content --> | ||||||
|
@@ -212,20 +210,18 @@ | |||||
|
||||||
<!-- Navigation button --> | ||||||
<transition name="fade-visibility"> | ||||||
<a v-show="hasNext" | ||||||
<ButtonVue v-show="hasNext" | ||||||
type="tertiary-no-background" | ||||||
class="next" | ||||||
href="#" | ||||||
:class="{ | ||||||
invisible: !hasNext | ||||||
}" | ||||||
@click.prevent.stop="next"> | ||||||
<span class="icon-next"> | ||||||
:aria-label="nextButtonAriaLabel" | ||||||
@click="next"> | ||||||
<template #icon> | ||||||
<ChevronRight :size="40" /> | ||||||
<span class="hidden-visually"> | ||||||
{{ t('Next') }} | ||||||
</span> | ||||||
</span> | ||||||
</a> | ||||||
</template> | ||||||
</ButtonVue> | ||||||
</transition> | ||||||
</div> | ||||||
</transition> | ||||||
|
@@ -235,7 +231,6 @@ | |||||
|
||||||
<script> | ||||||
import Actions from '../Actions/index.js' | ||||||
import ActionButton from '../ActionButton/index.js' | ||||||
import Tooltip from '../../directives/Tooltip/index.js' | ||||||
import l10n from '../../mixins/l10n.js' | ||||||
import Timer from '../../utils/Timer.js' | ||||||
|
@@ -254,7 +249,6 @@ export default { | |||||
name: 'Modal', | ||||||
|
||||||
components: { | ||||||
ActionButton, | ||||||
Actions, | ||||||
ChevronLeft, | ||||||
ChevronRight, | ||||||
|
@@ -403,6 +397,12 @@ export default { | |||||
closeButtonAriaLabel() { | ||||||
return t('Close modal') | ||||||
}, | ||||||
prevButtonAriaLabel() { | ||||||
return t('Previous') | ||||||
}, | ||||||
nextButtonAriaLabel() { | ||||||
return t('Next') | ||||||
}, | ||||||
}, | ||||||
|
||||||
watch: { | ||||||
|
@@ -761,17 +761,6 @@ export default { | |||||
right: 0; | ||||||
} | ||||||
|
||||||
// buttons/icons | ||||||
.icon-next, | ||||||
.icon-previous { | ||||||
box-sizing: border-box; | ||||||
width: $clickable-area; | ||||||
height: $clickable-area; | ||||||
color: white; | ||||||
background-image: none; | ||||||
display: flex; | ||||||
} | ||||||
|
||||||
/* Content */ | ||||||
.modal-container { | ||||||
position: relative; | ||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regression, fix in #3066