From 6e1a48f08465642f742c8bc2bebecc942947b9a7 Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Mon, 11 Sep 2017 13:12:53 +0530
Subject: [PATCH] Modify theme support

---
 .../src/main/resources/publisher/src/App.jsx                  | 4 ++--
 .../src/main/resources/publisher/src/index.js                 | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx
index 6ba02176e57..58002cfb62d 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx
@@ -71,7 +71,6 @@ class Base extends Component {
         if (this.state.user) {
             return (
                 <div className="container">
-                    <MuiThemeProvider muiTheme={muiTheme}>
                     <BaseLayout>
                         <Switch>
                             <Redirect exact path={"/"} to={"/assets/apps"}/>
@@ -88,7 +87,6 @@ class Base extends Component {
                             <Route component={NotFound}/>
                         </Switch>
                     </BaseLayout>
-                    </MuiThemeProvider>
                 </div>
             )
         }
@@ -106,6 +104,7 @@ class Publisher extends Component {
     render() {
         return (
             <div className="App">
+                <MuiThemeProvider muiTheme={muiTheme}>
                 <Router basename="publisher" history={history}>
                     <Switch>
                         <Route path="/login" component={Login}/>
@@ -113,6 +112,7 @@ class Publisher extends Component {
                         <Route component={Base}/>
                     </Switch>
                 </Router>
+                </MuiThemeProvider>
             </div>
         );
     }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
index e94b5727376..025a12afbe6 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/index.js
@@ -21,10 +21,9 @@ import React from 'react';
 import Publisher from './App';
 import ReactDOM from 'react-dom';
 import registerServiceWorker from './registerServiceWorker';
-import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 
 /**
  * This is the base js file of the app. All the content will be rendered in the root element.
  * */
-ReactDOM.render(<MuiThemeProvider><Publisher/></MuiThemeProvider>, document.getElementById('root'));
+ReactDOM.render(<Publisher/>, document.getElementById('root'));
 registerServiceWorker();