Skip to content
Snippets Groups Projects
Unverified Commit a3c54ff6 authored by Diego Sampaio's avatar Diego Sampaio
Browse files

Fix tab bar border color

parent 33804624
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,8 @@ RocketChatTabBar = class RocketChatTabBar { ...@@ -42,6 +42,8 @@ RocketChatTabBar = class RocketChatTabBar {
} }
open(button) { open(button) {
this.state.set('opened');
if (button) { if (button) {
if (typeof button !== 'object' || !button.id) { if (typeof button !== 'object' || !button.id) {
button = RocketChat.TabBar.getButton(button); button = RocketChat.TabBar.getButton(button);
...@@ -54,10 +56,10 @@ RocketChatTabBar = class RocketChatTabBar { ...@@ -54,10 +56,10 @@ RocketChatTabBar = class RocketChatTabBar {
this.template.set(button.template); this.template.set(button.template);
} }
this.state.set('opened'); Tracker.afterFlush(() => {
$('.flex-tab').find('input[type=text]:first').focus();
$('.flex-tab').find('input[type=text]:first').focus(); $('.flex-tab .content').scrollTop(0);
$('.flex-tab .content').scrollTop(0); });
} }
close() { close() {
......
...@@ -3314,7 +3314,7 @@ body:not(.is-cordova) { ...@@ -3314,7 +3314,7 @@ body:not(.is-cordova) {
} }
&.active { &.active {
border-right: 3px solid; border-width: 0 3px 0 0;
button { button {
margin-left: 3px; margin-left: 3px;
...@@ -4384,6 +4384,7 @@ body:not(.is-cordova) { ...@@ -4384,6 +4384,7 @@ body:not(.is-cordova) {
.flex-tab.opened { .flex-tab.opened {
position: absolute; position: absolute;
right: 40px; right: 40px;
border-width: 0 0 0 1px;
} }
} }
} }
......
<template name="flexTabBar"> <template name="flexTabBar">
<section class="flex-tab {{opened}}"> <section class="flex-tab border-component-color {{opened}}">
{{> Template.dynamic template=template data=flexData}} {{> Template.dynamic template=template data=flexData}}
</section> </section>
<div class="flex-tab-bar" role="toolbar"> <div class="flex-tab-bar" role="toolbar">
......
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