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
This commit is contained in:
commit
ce9fd04865
@ -94,6 +94,9 @@
|
|||||||
grid-template-columns: 2fr auto;
|
grid-template-columns: 2fr auto;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
a {
|
||||||
|
color: var(--topBarLink, $fallback--link);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.mobile-inner-nav {
|
.mobile-inner-nav {
|
||||||
|
@ -50,7 +50,7 @@ export default {
|
|||||||
activeIndex () {
|
activeIndex () {
|
||||||
// In case of controlled component
|
// In case of controlled component
|
||||||
if (this.activeTab) {
|
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 {
|
} else {
|
||||||
return this.active
|
return this.active
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="thread-tree panel-body">
|
<div class="thread-tree">
|
||||||
<status
|
<status
|
||||||
:key="status.id"
|
:key="status.id"
|
||||||
ref="statusComponent"
|
ref="statusComponent"
|
||||||
|
Loading…
Reference in New Issue
Block a user