diff options
| author | jamiewalch <jamiewalch@chromium.org> | 2014-08-28 14:38:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 21:40:10 +0000 |
| commit | 6c9ccd1a53b92f8aef4f4bdd2bc8b665849cc02e (patch) | |
| tree | 962f6c9a6e3817568ffaf1f533c4a9682f3e7799 | |
| parent | 196db19755cd25d7da5371442c2394e1510051ad (diff) | |
| download | chromium_src-6c9ccd1a53b92f8aef4f4bdd2bc8b665849cc02e.zip chromium_src-6c9ccd1a53b92f8aef4f4bdd2bc8b665849cc02e.tar.gz chromium_src-6c9ccd1a53b92f8aef4f4bdd2bc8b665849cc02e.tar.bz2 | |
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}
| -rw-r--r-- | remoting/webapp/html/template_main.html | 108 | ||||
| -rw-r--r-- | remoting/webapp/window_frame.css | 4 |
2 files changed, 60 insertions, 52 deletions
diff --git a/remoting/webapp/html/template_main.html b/remoting/webapp/html/template_main.html index 49b6cbd..915ac23 100644 --- a/remoting/webapp/html/template_main.html +++ b/remoting/webapp/html/template_main.html @@ -25,77 +25,81 @@ found in the LICENSE file. <meta-include src="webapp/html/window_frame.html"/> - <!-- loading-mode is initially visible, but becomes hidden as soon as an - 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…</em> - </section> + <div class="window-body"> - <div id="daemon-plugin-container"></div> - <div id="host-plugin-container"></div> + <!-- loading-mode is initially visible, but becomes hidden as soon as an + 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…</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" - 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> + <iframe id="wcs-sandbox" src="wcs_sandbox.html" hidden></iframe> - <div id="scroller"> - <div class="inset home-screen" data-ui-mode="home" hidden> + <div class="dialog-screen" + 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"/> - <meta-include src="webapp/html/butterbar.html"/> - <meta-include src="webapp/html/ui_it2me.html"/> - <meta-include src="webapp/html/ui_me2me.html"/> + <div id="scroller"> + <div class="inset home-screen" data-ui-mode="home" hidden> - </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" - 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_auth.html"/> - <meta-include src="webapp/html/dialog_token_refresh_failed.html"/> - <meta-include src="webapp/html/dialog_host_setup.html"/> - <meta-include src="webapp/html/dialog_host_install.html"/> - <meta-include src="webapp/html/dialog_host.html"/> + <div class="dialog-container" + 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> - <div id="client-dialog" - class="kd-modaldialog" - data-ui-mode="home.client"> + <meta-include src="webapp/html/dialog_token_refresh_failed.html"/> + <meta-include src="webapp/html/dialog_host_setup.html"/> + <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"/> - <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 id="client-dialog" + class="kd-modaldialog" + data-ui-mode="home.client"> - </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_confirm_host_delete.html"/> - <meta-include src="webapp/html/dialog_manage_pairings.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_manage_pairings.html"/> - </div> <!-- dialog-container --> + </div> <!-- dialog-container --> - <div id="session-mode" - data-ui-mode="in-session home.client" - class="full-height" - hidden> + <div id="session-mode" + data-ui-mode="in-session home.client" + class="full-height" + hidden> - <meta-include src="webapp/html/toolbar.html"/> - <meta-include src="webapp/html/client_plugin.html"/> + <meta-include src="webapp/html/toolbar.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> + </div> <!-- scroller --> - </div> <!-- scroller -> + </div> <!-- window-body --> </body> </html> diff --git a/remoting/webapp/window_frame.css b/remoting/webapp/window_frame.css index 5821400..a138921 100644 --- a/remoting/webapp/window_frame.css +++ b/remoting/webapp/window_frame.css @@ -3,6 +3,10 @@ * found in the LICENSE file. */ +.window-body { + position: relative; +} + html.apps-v2, html.apps-v2 body { height: 100%; |