Rebase changes

* Rebase changes
mui · Jan 30, 2016 · a1e02e1 · a1e02e1
1 parent ef20dbd
commit a1e02e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/tabs/tab-paginator-button.jsx b/src/tabs/tab-paginator-button.jsx
@@ -130,7 +130,8 @@ const TabPaginatorButton = React.createClass({
         disabled={disabled}
         iconClassName="material-icons"
         iconStyle={this.mergeStyles(iconStyle, styles.iconStyle)}
-        style={this.mergeStyles(styles.buttonStyle, style)}>
+        style={this.mergeStyles(styles.buttonStyle, style)}
+      >
         {isLeftPaginatorButton ? 'keyboard_arrow_left' : 'keyboard_arrow_right'}
       </IconButton>
     );

diff --git a/src/tabs/tabs.jsx b/src/tabs/tabs.jsx
@@ -467,25 +467,30 @@ const Tabs = React.createClass({
       >
         <div
           ref={Constants.TAB_WRAPPER_REF_NAME}
-          style={this.prepareStyles(styles.tabWrapper, tabWrapperStyle)}>
+          style={this.prepareStyles(styles.tabWrapper, tabWrapperStyle)}
+        >
           <TabPaginatorButton display={this.state.shouldPaginate}
             isLeftPaginatorButton={true}
             style={tabPaginatorButtonStyle}
             iconStyle={tabPaginatorButtonIconStyle}
             disabled={this.state.disableLeftPaginatorButton}
-            onTouchTap={this._handleLeftTabPaginatorTap}/>
+            onTouchTap={this._handleLeftTabPaginatorTap}
+          />
           <TabPaginatorButton display={this.state.shouldPaginate}
             isLeftPaginatorButton={false}
             style={tabPaginatorButtonStyle}
             iconStyle={tabPaginatorButtonIconStyle}
             disabled={this.state.disableRightPaginatorButton}
-            onTouchTap={this._handleRightTabPaginatorTap}/>
+            onTouchTap={this._handleRightTabPaginatorTap}
+          />
           <div
             ref={Constants.TAB_SCROLL_WRAPPER_REF_NAME}
-            style={styles.tabScrollWrapper}>
+            style={styles.tabScrollWrapper}
+          >
             <div
               ref={Constants.TAB_CONTAINER_REF_NAME}
-              style={this.prepareStyles(styles.tabItemContainer, tabItemContainerStyle)}>
+              style={this.prepareStyles(styles.tabItemContainer, tabItemContainerStyle)}
+            >
               {tabs}
             </div>
             <div style={{width: inkBarContainerWidth}}>