OLD | NEW |
---|---|
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="../a11y_page/a11y_page.html"> | 2 <link rel="import" href="../a11y_page/a11y_page.html"> |
3 <link rel="import" href="../appearance_page/appearance_page.html"> | 3 <link rel="import" href="../appearance_page/appearance_page.html"> |
4 <link rel="import" href="../controls/settings_idle_render.html"> | 4 <link rel="import" href="../controls/settings_idle_render.html"> |
5 <link rel="import" href="../downloads_page/downloads_page.html"> | 5 <link rel="import" href="../downloads_page/downloads_page.html"> |
6 <link rel="import" href="../languages_page/languages_page.html"> | 6 <link rel="import" href="../languages_page/languages_page.html"> |
7 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 7 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht ml"> | 8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht ml"> |
9 <link rel="import" href="../people_page/people_page.html"> | 9 <link rel="import" href="../people_page/people_page.html"> |
10 <link rel="import" href="../printing_page/printing_page.html"> | 10 <link rel="import" href="../printing_page/printing_page.html"> |
(...skipping 18 matching lines...) Expand all Loading... | |
29 <if expr="not chromeos"> | 29 <if expr="not chromeos"> |
30 <link rel="import" href="../default_browser_page/default_browser_page.html"> | 30 <link rel="import" href="../default_browser_page/default_browser_page.html"> |
31 <link rel="import" href="../system_page/system_page.html"> | 31 <link rel="import" href="../system_page/system_page.html"> |
32 </if> | 32 </if> |
33 | 33 |
34 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page | 34 <!-- TODO(michaelpg): Rename to something better than "basic" now that this page |
35 includes both the basic and advanced settings. --> | 35 includes both the basic and advanced settings. --> |
36 <dom-module id="settings-basic-page"> | 36 <dom-module id="settings-basic-page"> |
37 <template> | 37 <template> |
38 <style include="settings-page-styles"> | 38 <style include="settings-page-styles"> |
39 :host { | |
40 /* Prevent an unwanted horizontal scrollbar when transitioning back from | |
41 * a sub-page. */ | |
42 overflow: hidden; | |
dpapad
2017/03/16 20:51:19
Does this create a problem when the page is too na
dschuyler
2017/03/16 21:01:43
The content is still fully accessible.
dpapad
2017/03/16 21:13:52
This suggestion was dependent on the question abov
| |
43 } | |
44 | |
39 #advancedToggle { | 45 #advancedToggle { |
40 --paper-button: { | 46 --paper-button: { |
41 text-transform: none; | 47 text-transform: none; |
42 } | 48 } |
43 @apply(--settings-actionable); | 49 @apply(--settings-actionable); |
44 align-items: center; | 50 align-items: center; |
45 display: flex; | 51 display: flex; |
46 margin-bottom: 3px; | 52 margin-bottom: 3px; |
47 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 53 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
48 min-height: 32px; | 54 min-height: 32px; |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 section="reset"> | 274 section="reset"> |
269 <settings-reset-page></settings-reset-page> | 275 <settings-reset-page></settings-reset-page> |
270 </settings-section> | 276 </settings-section> |
271 </template> | 277 </template> |
272 </div> | 278 </div> |
273 </template> | 279 </template> |
274 </template> | 280 </template> |
275 </template> | 281 </template> |
276 <script src="basic_page.js"></script> | 282 <script src="basic_page.js"></script> |
277 </dom-module> | 283 </dom-module> |
OLD | NEW |