WIP: add wrapper to bootstrap css so it does not collide with assets

zanata · Feb 21, 2018 · 17c5ce9 · 17c5ce9
1 parent 1a74f3a
commit 17c5ce9
Show file tree

Hide file tree

Showing 3 changed files with 5,508 additions and 5,170 deletions.
diff --git a/server/zanata-frontend/src/app/containers/App.js b/server/zanata-frontend/src/app/containers/App.js
@@ -36,14 +36,16 @@ class App extends Component {
       '/signup': configLinks.registerUrl
     }
     return (
-      <div className='view H(100vh)! Fld(c) Fld(r)--sm'>
-        <Icons />
-        <Helmet
-          title='Zanata'
-          titleTemplate='Zanata: %s'
-        />
-        <Nav active={activePath} links={links} loading={loading} />
-        <div className='containerSidebar'>{children}</div>
+      <div className='bstrapReact'>
+        <div className='view H(100vh)! Fld(c) Fld(r)--sm'>
+
+          <Helmet
+            title='Zanata'
+            titleTemplate='Zanata: %s'
+          />
+          <Nav active={activePath} links={links} loading={loading} />
+          <div className='containerSidebar'>{children}</div>
+        </div>
       </div>
     )
   }

diff --git a/server/zanata-frontend/src/app/entrypoint/index.js b/server/zanata-frontend/src/app/entrypoint/index.js
@@ -62,6 +62,6 @@ const enhancedHistory = syncHistoryWithStore(history, store)
 
 render(
   // @ts-ignore store
-  <Root store={store} history={enhancedHistory} />,
+  <Root store={store} history={enhancedHistory} className='bstrapReact' />,
   document.getElementById('root')
 )