Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2261)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/arc_support/main.html

Issue 2142933006: arc: Implement scrollable OptIn window content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: style changes Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/arc_support/main.css ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/arc_support/main.html
diff --git a/chrome/browser/resources/chromeos/arc_support/main.html b/chrome/browser/resources/chromeos/arc_support/main.html
index 4cd3b6db4a856e593e0fdb60a1300b9beeb7b96f..c9dd9b23c66d5f74e811846f113537a7b1d5f568 100644
--- a/chrome/browser/resources/chromeos/arc_support/main.html
+++ b/chrome/browser/resources/chromeos/arc_support/main.html
@@ -44,40 +44,55 @@
<body>
<div id="terms-loading" class="section">
<img class="image-header" src="images/header.png">
- <p class="text-title" i18n-content="greetingHeader"></p>
- <p class="text-desc" i18n-content="greetingDescription"></p>
- <paper-progress class="blue" indeterminate></paper-progress>
+ <div class="scrollable">
+ <div class="content">
+ <p class="text-title" i18n-content="greetingHeader"></p>
+ <p class="text-desc" i18n-content="greetingDescription"></p>
+ <paper-progress class="blue" indeterminate></paper-progress>
+ </div>
+ </div>
</div>
- <div id="terms" class="section section-flex" hidden>
+ <div id="terms" class="section" hidden>
<img class="image-header" src="images/header.png">
- <p class="text-title" i18n-content="greetingHeader"></p>
- <p class="text-desc" i18n-content="greetingDescription"></p>
- <p class="text-terms-title" i18n-content="termsOfService"></p>
- <div class="section-terms" id ="terms-container">
- <webview id="terms-view" partition="persist:arc_support"></webview>
- </div>
- <div class="layout horizontal section-checkbox-container">
- <input type="checkbox" class="checkbox-option" id="enable-metrics" hidden>
- <p class="checkbox-text" id="text-metrics"></p>
- </div>
- <div id="section-backup-restore" class="layout horizontal
- section-checkbox-container">
- <input type="checkbox" class="checkbox-option" id="enable-backup-restore">
- <p class="checkbox-text" id="text-backup-restore"></p>
- </div>
- <div class="layout horizontal end-justified section-buttons">
- <paper-button class="white" id="button-cancel"
- i18n-content="buttonCancel">
- </paper-button>
- <div class="button-separator"></div>
- <paper-button class="blue" id="button-agree" i18n-content="buttonAgree">
- </paper-button>
+ <div class="scrollable" >
+ <div class="content section-flex">
+ <p class="text-title" i18n-content="greetingHeader"></p>
+ <p class="text-desc" i18n-content="greetingDescription"></p>
+ <p class="text-terms-title" i18n-content="termsOfService"></p>
+ <div class="section-terms" id ="terms-container">
+ <webview id="terms-view" partition="persist:arc_support"></webview>
+ </div>
+ <div class="layout horizontal section-checkbox-container">
+ <input type="checkbox" class="checkbox-option" id="enable-metrics"
+ hidden>
+ <p class="checkbox-text" id="text-metrics"></p>
+ </div>
+ <div id="section-backup-restore" class="layout horizontal
+ section-checkbox-container">
+ <input type="checkbox" class="checkbox-option"
+ id="enable-backup-restore">
+ <p class="checkbox-text" id="text-backup-restore"></p>
+ </div>
+ <div class="layout horizontal end-justified section-buttons">
+ <paper-button class="white" id="button-cancel"
+ i18n-content="buttonCancel">
+ </paper-button>
+ <div class="button-separator"></div>
+ <paper-button class="blue" id="button-agree"
+ i18n-content="buttonAgree">
+ </paper-button>
+ </div>
+ </div>
</div>
</div>
<div id="lso-loading" class="section" hidden>
<img class="image-header" src="images/header.png">
- <paper-progress class="blue" indeterminate></paper-progress>
- <p class="text-status" i18n-content=progressLsoLoading></p>
+ <div class="scrollable">
+ <div class="content">
+ <paper-progress class="blue" indeterminate></paper-progress>
+ <p class="text-status" i18n-content=progressLsoLoading></p>
+ </div>
+ </div>
</div>
<div id="lso" class="section" hidden>
<img class="image-header" src="images/header.png">
@@ -85,18 +100,26 @@
</div>
<div id="arc-loading" class="section" hidden>
<img class="image-header" src="images/header.png">
- <paper-progress class="blue" indeterminate></paper-progress>
- <p class="text-status" i18n-content="progressAndroidLoading"></p>
+ <div class="scrollable">
+ <div class="content">
+ <paper-progress class="blue" indeterminate></paper-progress>
+ <p class="text-status" i18n-content="progressAndroidLoading"></p>
+ </div>
+ </div>
</div>
<div id="error" class="section" hidden>
<img class="image-header" src="images/header.png">
- <paper-progress class="red" value="100" max="100" ></paper-progress>
- <p class="text-status" id="error-message"></p>
- <paper-button class="blue" id="button-send-feedback"
- i18n-content="buttonSendFeedback">
- </paper-button>
- <paper-button class="blue" id="button-retry" i18n-content="buttonRetry">
- </paper-button>
+ <div class="scrollable">
+ <div class="content">
+ <paper-progress class="red" value="100" max="100" ></paper-progress>
+ <p class="text-status" id="error-message"></p>
+ <paper-button class="blue" id="button-send-feedback"
+ i18n-content="buttonSendFeedback">
+ </paper-button>
+ <paper-button class="blue" id="button-retry" i18n-content="buttonRetry">
+ </paper-button>
+ </div>
+ </div>
</div>
</body>
</html>
« no previous file with comments | « chrome/browser/resources/chromeos/arc_support/main.css ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698