Skip to content

GitLab

T
tangled
Commit 6c9ccd1a authored by jamiewalch's avatar jamiewalch Committed by Commit bot
Browse files
Options

Fix dialog screen position. 

https://codereview.chromium.org/478033004/ broke the dialog screen, causing it
to cover the title-bar in apps v2. This fixes it be adding an explicit <div>
representing the window client area (the logical <body> for apps v2).

Review URL: https://codereview.chromium.org/507013002

Cr-Commit-Position: refs/heads/master@{#292465}
parent 196db197
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 52 deletions
remoting/webapp/html/template_main.html
View file @ 6c9ccd1a
...@@ -25,77 +25,81 @@ found in the LICENSE file. ...@@ -25,77 +25,81 @@ found in the LICENSE file.
<meta-include src="webapp/html/window_frame.html"/> <meta-include src="webapp/html/window_frame.html"/>
<!-- loading-mode is initially visible, but becomes hidden as soon as an <div class="window-body">
AppMode is selected by remoting.init. All other divs are initially
hidden, but are shown appropriately when the mode changes. -->
<section id="loading-mode" data-ui-mode="">
<em>Loading&hellip;</em>
</section>
<div id="daemon-plugin-container"></div> <!-- loading-mode is initially visible, but becomes hidden as soon as an
<div id="host-plugin-container"></div> AppMode is selected by remoting.init. All other divs are initially
hidden, but are shown appropriately when the mode changes. -->
<section id="loading-mode" data-ui-mode="">
<em>Loading&hellip;</em>
</section>
<iframe id="wcs-sandbox" src="wcs_sandbox.html" hidden></iframe> <div id="daemon-plugin-container"></div>
<div id="host-plugin-container"></div>
<div class="dialog-screen" <iframe id="wcs-sandbox" src="wcs_sandbox.html" hidden></iframe>
data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-setup home.token-refresh-failed home.manage-pairings home.host-setup home.host-install"
hidden></div>
<div id="scroller"> <div class="dialog-screen"
<div class="inset home-screen" data-ui-mode="home" hidden> data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-setup home.token-refresh-failed home.manage-pairings home.host-setup home.host-install"
hidden></div>
<meta-include src="webapp/html/ui_header.html"/> <div id="scroller">
<meta-include src="webapp/html/butterbar.html"/> <div class="inset home-screen" data-ui-mode="home" hidden>
<meta-include src="webapp/html/ui_it2me.html"/>
<meta-include src="webapp/html/ui_me2me.html"/>
</div> <!-- inset --> <meta-include src="webapp/html/ui_header.html"/>
<meta-include src="webapp/html/butterbar.html"/>
<meta-include src="webapp/html/ui_it2me.html"/>
<meta-include src="webapp/html/ui_me2me.html"/>
<meta-include src="webapp/html/dialog_auth.html"/> </div> <!-- inset -->
<div class="dialog-container" <meta-include src="webapp/html/dialog_auth.html"/>
data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-install home.host-setup home.token-refresh-failed home.manage-pairings"
hidden>
<meta-include src="webapp/html/dialog_token_refresh_failed.html"/> <div class="dialog-container"
<meta-include src="webapp/html/dialog_host_setup.html"/> data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-install home.host-setup home.token-refresh-failed home.manage-pairings"
<meta-include src="webapp/html/dialog_host_install.html"/> hidden>
<meta-include src="webapp/html/dialog_host.html"/>
<div id="client-dialog" <meta-include src="webapp/html/dialog_token_refresh_failed.html"/>
class="kd-modaldialog" <meta-include src="webapp/html/dialog_host_setup.html"/>
data-ui-mode="home.client"> <meta-include src="webapp/html/dialog_host_install.html"/>
<meta-include src="webapp/html/dialog_host.html"/>
<meta-include src="webapp/html/dialog_client_unconnected.html"/> <div id="client-dialog"
<meta-include src="webapp/html/dialog_client_connecting.html"/> class="kd-modaldialog"
<meta-include src="webapp/html/dialog_client_host_needs_upgrade.html"/> data-ui-mode="home.client">
<meta-include src="webapp/html/dialog_client_pin_prompt.html"/>
<meta-include src="webapp/html/dialog_client_third_party_auth.html"/>
<meta-include src="webapp/html/dialog_client_connect_failed.html"/>
<meta-include src="webapp/html/dialog_client_session_finished.html"/>
</div> <meta-include src="webapp/html/dialog_client_unconnected.html"/>
<meta-include src="webapp/html/dialog_client_connecting.html"/>
<meta-include src="webapp/html/dialog_client_host_needs_upgrade.html"/>
<meta-include src="webapp/html/dialog_client_pin_prompt.html"/>
<meta-include src="webapp/html/dialog_client_third_party_auth.html"/>
<meta-include src="webapp/html/dialog_client_connect_failed.html"/>
<meta-include src="webapp/html/dialog_client_session_finished.html"/>
</div>
<meta-include src="webapp/html/dialog_connection_history.html"/> <meta-include src="webapp/html/dialog_connection_history.html"/>
<meta-include src="webapp/html/dialog_confirm_host_delete.html"/> <meta-include src="webapp/html/dialog_confirm_host_delete.html"/>
<meta-include src="webapp/html/dialog_manage_pairings.html"/> <meta-include src="webapp/html/dialog_manage_pairings.html"/>
</div> <!-- dialog-container --> </div> <!-- dialog-container -->
<div id="session-mode" <div id="session-mode"
data-ui-mode="in-session home.client" data-ui-mode="in-session home.client"
class="full-height" class="full-height"
hidden> hidden>
<meta-include src="webapp/html/toolbar.html"/> <meta-include src="webapp/html/toolbar.html"/>
<meta-include src="webapp/html/client_plugin.html"/> <meta-include src="webapp/html/client_plugin.html"/>
</div> <!-- session-mode --> </div> <!-- session-mode -->
<div id="statistics" dir="ltr" class="selectable" hidden>
</div>
<div id="statistics" dir="ltr" class="selectable" hidden> </div> <!-- scroller -->
</div>
</div> <!-- scroller -> </div> <!-- window-body -->
</body> </body>
</html> </html>
remoting/webapp/window_frame.css
View file @ 6c9ccd1a
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
.window-body {
position: relative;
}
html.apps-v2, html.apps-v2,
html.apps-v2 body { html.apps-v2 body {
height: 100%; height: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment