Merge pull request #6574 from jide/rootid

Rename React root div from windowContainer to appContainer
brave · Jan 28, 2017 · 24ebbf1 · 24ebbf1
2 parents 4fe1205 + 5571daa
commit 24ebbf1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/app/extensions/brave/index-dev.html b/app/extensions/brave/index-dev.html
@@ -19,7 +19,7 @@
     <link rel="localization" href="locales/{locale}/downloads.properties">
   </head>
   <body>
-    <div id="windowContainer">
+    <div id="appContainer">
       <div id="webpackLoading" style="display:none">
         <p>
           <span>Loading...</span>

diff --git a/app/extensions/brave/index.html b/app/extensions/brave/index.html
@@ -19,7 +19,7 @@
     <link rel="localization" href="locales/{locale}/downloads.properties"/>
   </head>
   <body>
-    <div id="windowContainer"/>
+    <div id="appContainer"/>
   </body>
 
 </html>
diff --git a/js/entry.js b/js/entry.js
@@ -74,5 +74,5 @@ ipc.on(messages.INITIALIZE_WINDOW, (e, disposition, appState, frames, initWindow
   appStoreRenderer.state = Immutable.fromJS(appState)
   ReactDOM.render(
     <Window includePinnedSites={disposition !== 'new-popup'} frames={frames} initWindowState={initWindowState} />,
-    document.getElementById('windowContainer'))
+    document.getElementById('appContainer'))
 })
diff --git a/less/window.less b/less/window.less
@@ -31,6 +31,7 @@ html,
   }
 }
 
+#appContainer,
 #windowContainer {
   width: 100%;
   height: 100%;