logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: ce9fd04865719ac80b92bbfb84cc81e685c8016b
parent 684650e14fd88e47180b2feda6c5cff9171eb566
Author: Henry Jameson <me@hjkos.com>
Date:   Sun, 10 Apr 2022 14:54:03 +0300

Merge remote-tracking branch 'origin/develop' into threecolumn

* origin/develop:
  Fix tab switcher not working when some tabs hidden
  Fix mobile nav link text colour
  Fix shrug text in muted status

Diffstat:

Msrc/components/mobile_nav/mobile_nav.vue3+++
Msrc/components/tab_switcher/tab_switcher.jsx2+-
Msrc/components/thread_tree/thread_tree.vue2+-
3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue @@ -94,6 +94,9 @@ grid-template-columns: 2fr auto; width: 100%; box-sizing: border-box; + a { + color: var(--topBarLink, $fallback--link); + } } .mobile-inner-nav { diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx @@ -50,7 +50,7 @@ export default { activeIndex () { // In case of controlled component if (this.activeTab) { - return this.slots().findIndex(slot => this.activeTab === slot.props.key) + return this.slots().findIndex(slot => slot && slot.props && this.activeTab === slot.props.key) } else { return this.active } diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue @@ -1,5 +1,5 @@ <template> - <div class="thread-tree panel-body"> + <div class="thread-tree"> <status :key="status.id" ref="statusComponent"