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

Side by Side Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 2758863004: [MD settings] hide scrollbar during animation to subpage (Closed)
Patch Set: animating when either is a subpage Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_page/main_page_behavior.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="../appearance_page/appearance_page.html"> 2 <link rel="import" href="../appearance_page/appearance_page.html">
3 <link rel="import" href="../controls/settings_idle_load.html"> 3 <link rel="import" href="../controls/settings_idle_load.html">
4 <link rel="import" href="../on_startup_page/on_startup_page.html"> 4 <link rel="import" href="../on_startup_page/on_startup_page.html">
5 <link rel="import" href="../people_page/people_page.html"> 5 <link rel="import" href="../people_page/people_page.html">
6 <link rel="import" href="../reset_page/reset_profile_banner.html"> 6 <link rel="import" href="../reset_page/reset_profile_banner.html">
7 <link rel="import" href="../search_page/search_page.html"> 7 <link rel="import" href="../search_page/search_page.html">
8 <link rel="import" href="../settings_page/main_page_behavior.html"> 8 <link rel="import" href="../settings_page/main_page_behavior.html">
9 <link rel="import" href="../settings_page/settings_page_visibility.html"> 9 <link rel="import" href="../settings_page/settings_page_visibility.html">
10 <link rel="import" href="../settings_page/settings_section.html"> 10 <link rel="import" href="../settings_page/settings_section.html">
11 <link rel="import" href="../settings_page_css.html"> 11 <link rel="import" href="../settings_page_css.html">
12 <link rel="import" href="../settings_vars_css.html"> 12 <link rel="import" href="../settings_vars_css.html">
13 13
14 <if expr="chromeos"> 14 <if expr="chromeos">
15 <link rel="import" href="../android_apps_page/android_apps_page.html"> 15 <link rel="import" href="../android_apps_page/android_apps_page.html">
16 <link rel="import" href="../bluetooth_page/bluetooth_page.html"> 16 <link rel="import" href="../bluetooth_page/bluetooth_page.html">
17 <link rel="import" href="../device_page/device_page.html"> 17 <link rel="import" href="../device_page/device_page.html">
18 <link rel="import" href="../internet_page/internet_page.html"> 18 <link rel="import" href="../internet_page/internet_page.html">
19 </if> 19 </if>
20 20
21 <if expr="not chromeos"> 21 <if expr="not chromeos">
22 <link rel="import" href="../default_browser_page/default_browser_page.html"> 22 <link rel="import" href="../default_browser_page/default_browser_page.html">
23 </if> 23 </if>
24 24
25 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page 25 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page
26 includes both the basic and advanced settings. --> 26 includes both the basic and advanced settings. -->
27 <dom-module id="settings-basic-page"> 27 <dom-module id="settings-basic-page">
28 <template> 28 <template>
29 <style include="settings-page-styles"> 29 <style include="settings-page-styles">
30 :host([is-subpage-animating]) {
31 /* Prevent an unwanted horizontal scrollbar when transitioning back from
32 * a sub-page. */
33 overflow: hidden;
34 }
35
30 #advancedToggle { 36 #advancedToggle {
31 --paper-button: { 37 --paper-button: {
32 text-transform: none; 38 text-transform: none;
33 } 39 }
34 @apply(--settings-actionable); 40 @apply(--settings-actionable);
35 align-items: center; 41 align-items: center;
36 display: flex; 42 display: flex;
37 margin-bottom: 3px; 43 margin-bottom: 3px;
38 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ 44 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */
39 min-height: 32px; 45 min-height: 32px;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 section="reset"> 266 section="reset">
261 <settings-reset-page></settings-reset-page> 267 <settings-reset-page></settings-reset-page>
262 </settings-section> 268 </settings-section>
263 </template> 269 </template>
264 </div> 270 </div>
265 </template> 271 </template>
266 </template> 272 </template>
267 </template> 273 </template>
268 <script src="basic_page.js"></script> 274 <script src="basic_page.js"></script>
269 </dom-module> 275 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_page/main_page_behavior.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698