diff options
| author | Henry Jameson <me@hjkos.com> | 2019-06-13 00:07:28 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-06-13 00:07:28 +0300 |
| commit | 77511a5338a36e824b2521ea972d654517d2aed0 (patch) | |
| tree | 428bde231ecc98cbe18153904d9a9aeba75e3be2 /src/components/extra_buttons/extra_buttons.vue | |
| parent | e7a2a7267dbd8a4ee3d266d22249459d028569d6 (diff) | |
| parent | 9df99c5205b1cb560bb25c0dd81cc90acbde4d7f (diff) | |
Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret
* upstream/develop:
Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
i18n/Update Japanese translation
render modal at the root level using portal
install portal vue
Small improve of the who to follow panel layout
Fix/Small fix in the who to follow page
remove console spam
i18n
wire up user.description with masto api data
i18n/Add Japanese with kanji (2)
move drowdown menu to popper
notification controls: redesign entirely
entity normalizer: collapse data.pleroma if blocks
wire up notification settings
do not miss statusnet_profile_url of mentions
Translation to Hebrew of everything other than theme_helpers and style.
Translate up to settings.
mastoapi login works
Diffstat (limited to 'src/components/extra_buttons/extra_buttons.vue')
| -rw-r--r-- | src/components/extra_buttons/extra_buttons.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index ef11138d..a761d313 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -13,7 +13,7 @@ }" > <div class="popper-wrapper"> - <div class="dropdown-menu"> + <div class="dropdown-menu"> <button class="dropdown-item dropdown-item-icon" @click.prevent="pinStatus" v-if="!status.pinned && canPin"> <i class="icon-pin"></i><span>{{$t("status.pin")}}</span> </button> @@ -35,6 +35,7 @@ <style lang="scss"> @import '../../_variables.scss'; +@import '../popper/popper.scss'; .icon-ellipsis { cursor: pointer; |
