diff options
| author | Henry Jameson <me@hjkos.com> | 2022-04-10 14:54:03 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-04-10 14:54:03 +0300 |
| commit | ce9fd04865719ac80b92bbfb84cc81e685c8016b (patch) | |
| tree | 1c47906dd6fd97db3c04922e4a39cd038c512253 | |
| parent | 684650e14fd88e47180b2feda6c5cff9171eb566 (diff) | |
| parent | 4d15cbcbbd4b47fb37704f1408e5b8e6d9840758 (diff) | |
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
| -rw-r--r-- | src/components/mobile_nav/mobile_nav.vue | 3 | ||||
| -rw-r--r-- | src/components/tab_switcher/tab_switcher.jsx | 2 | ||||
| -rw-r--r-- | src/components/thread_tree/thread_tree.vue | 2 |
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 index 4976105d..362441bb 100644 --- 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 index f5a1e603..c8d390bc 100644 --- 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 index 74577583..4eaf597d 100644 --- 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" |