Skip to content
Snippets Groups Projects
Commit ce9fd048 authored by HJ's avatar HJ :fire:
Browse files

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
parents 684650e1 4d15cbcb
No related branches found
No related tags found
2 merge requests!1711Update stable - 2.5.0 release,!1503Layout refactoring + Three column mode
Pipeline #39660 passed
......@@ -94,6 +94,9 @@
grid-template-columns: 2fr auto;
width: 100%;
box-sizing: border-box;
a {
color: var(--topBarLink, $fallback--link);
}
}
.mobile-inner-nav {
......
......@@ -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
}
......
<template>
<div class="thread-tree panel-body">
<div class="thread-tree">
<status
:key="status.id"
ref="statusComponent"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment