Merge branch 'reactbutton-consistency' into 'develop'

Some fixes for reactbutton/extrabuttons

See merge request pleroma/pleroma-fe!1340
This commit is contained in:
HJ 2021-02-09 13:12:42 +00:00
commit 647d75f27c
3 changed files with 65 additions and 49 deletions

View file

@ -139,6 +139,11 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.ExtraButtons { .ExtraButtons {
/* override of popover internal stuff */
.popover-trigger-button {
width: auto;
}
.popover-trigger { .popover-trigger {
position: static; position: static;
padding: 10px; padding: 10px;

View file

@ -7,6 +7,7 @@
ref="trigger" ref="trigger"
class="button-unstyled -fullwidth popover-trigger-button" class="button-unstyled -fullwidth popover-trigger-button"
@click="onClick" @click="onClick"
type="button"
> >
<slot name="trigger" /> <slot name="trigger" />
</button> </button>

View file

@ -1,6 +1,7 @@
<template> <template>
<Popover <Popover
trigger="click" trigger="click"
class="ReactButton"
placement="top" placement="top"
:offset="{ y: 5 }" :offset="{ y: 5 }"
:bound-to="{ x: 'container' }" :bound-to="{ x: 'container' }"
@ -42,7 +43,7 @@
</div> </div>
<span <span
slot="trigger" slot="trigger"
class="ReactButton" class="popover-trigger"
:title="$t('tool_tip.add_reaction')" :title="$t('tool_tip.add_reaction')"
> >
<FAIcon <FAIcon
@ -58,9 +59,11 @@
<style lang="scss"> <style lang="scss">
@import '../../_variables.scss'; @import '../../_variables.scss';
.ReactButton {
.reaction-picker-filter { .reaction-picker-filter {
padding: 0.5em; padding: 0.5em;
display: flex; display: flex;
input { input {
flex: 1; flex: 1;
} }
@ -90,7 +93,8 @@
linear-gradient(to top, white, white); linear-gradient(to top, white, white);
transition: mask-size 150ms; transition: mask-size 150ms;
mask-size: 100% 20px, 100% 20px, auto; mask-size: 100% 20px, 100% 20px, auto;
// Autoprefixed seem to ignore this one, and also syntax is different
/* Autoprefixed seem to ignore this one, and also syntax is different */
-webkit-mask-composite: xor; -webkit-mask-composite: xor;
mask-composite: exclude; mask-composite: exclude;
@ -107,7 +111,12 @@
} }
} }
.ReactButton { /* override of popover internal stuff */
.popover-trigger-button {
width: auto;
}
.popover-trigger {
padding: 10px; padding: 10px;
margin: -10px; margin: -10px;
@ -116,5 +125,6 @@
color: var(--text, $fallback--text); color: var(--text, $fallback--text);
} }
} }
}
</style> </style>