logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 8e87e3d88bef3691b625c0a25407aa08bdf983ad
parent 6aa276374fdb0d20bd4c5e33aed1f67843d122d4
Author: Shpuld Shpuldson <shp@cock.li>
Date:   Mon,  9 Nov 2020 11:13:49 +0200

Update MASTER with develop for 2.2.1

Diffstat:

MCHANGELOG.md5+++++
Msrc/components/react_button/react_button.vue14++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [2.2.1] - 2020-11-09 +### Fixed +- Fixed regression in react popup alignment and overflowing + + ## [2.2.0] - 2020-11-06 ### Added - New option to optimize timeline rendering to make the site more responsive (enabled by default) diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue @@ -4,6 +4,7 @@ placement="top" :offset="{ y: 5 }" class="react-button-popover" + :bound-to="{ x: 'container' }" > <div slot="content" @@ -37,12 +38,13 @@ <div class="reaction-bottom-fader" /> </div> </div> - <FAIcon - slot="trigger" - class="fa-scale-110 fa-old-padding add-reaction-button" - :icon="['far', 'smile-beam']" - :title="$t('tool_tip.add_reaction')" - /> + <span slot="trigger"> + <FAIcon + class="fa-scale-110 fa-old-padding add-reaction-button" + :icon="['far', 'smile-beam']" + :title="$t('tool_tip.add_reaction')" + /> + </span> </Popover> </template>