Fix React warning by correctly wrapping the new team modal trigger bu…

…tton into a NavItem
mattermost · Feb 18, 2017 · 29b176b · 29b176b
1 parent 4dcbbb1
commit 29b176b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/browser/components/TabBar.jsx b/src/browser/components/TabBar.jsx
@@ -90,21 +90,25 @@ class TabBar extends React.Component {
       width: '40px',
       color: '#999',
       fontWeight: 'bold',
-      margin: '6px 0 0',
+      margin: '0',
       borderRadius: '2px 2px 0 0',
       outline: 'none'
     };
 
     return (
-      <Button
-        id='tabBarAddNewTeam'
-        onClick={this.props.onAddServer}
-        style={tabButton}
-        className='btn-tabButton'
-        title='Add new server'
+      <NavItem
+        className='buttonTab'
       >
-        {'+'}
-      </Button>
+        <Button
+          id='tabBarAddNewTeam'
+          onClick={this.props.onAddServer}
+          style={tabButton}
+          className='btn-tabButton'
+          title='Add new server'
+        >
+          {'+'}
+        </Button>
+      </NavItem>
     );
   }
 }

diff --git a/src/browser/css/index.css b/src/browser/css/index.css
@@ -42,6 +42,13 @@
   padding: 0 15px;
 }
 
+.nav-tabs>li.buttonTab>a {
+  border: none;
+  background: transparent;
+  margin-left: 1px; /*Has no border and would be placed above the last item's border due to it's margin-right: -1px */
+  padding: 0;
+  margin-bottom: 1px;
+}
 
 .has-error .control-label,
 .has-error .help-block {