| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 7 <link rel="import" href="/direction_delegate.html"> | 7 <link rel="import" href="/direction_delegate.html"> |
| 8 <link rel="import" href="/i18n_setup.html"> | 8 <link rel="import" href="/i18n_setup.html"> |
| 9 <link rel="import" href="/icons.html"> | 9 <link rel="import" href="/icons.html"> |
| 10 <link rel="import" href="/settings_main/settings_main.html"> | 10 <link rel="import" href="/settings_main/settings_main.html"> |
| 11 <link rel="import" href="/settings_menu/settings_menu.html"> | 11 <link rel="import" href="/settings_menu/settings_menu.html"> |
| 12 <link rel="import" href="/settings_shared_css.html"> | 12 <link rel="import" href="/settings_shared_css.html"> |
| 13 <link rel="import" href="/prefs/prefs.html"> | 13 <link rel="import" href="/prefs/prefs.html"> |
| 14 <link rel="import" href="/route.html"> | 14 <link rel="import" href="/route.html"> |
| 15 <link rel="import" href="/settings_vars_css.html"> | 15 <link rel="import" href="/settings_vars_css.html"> |
| 16 | 16 |
| 17 <dom-module id="settings-ui"> | 17 <dom-module id="settings-ui"> |
| 18 <template> | 18 <template> |
| 19 <style include="settings-shared"> | 19 <style include="settings-shared"> |
| 20 :host { | 20 :host { |
| 21 @apply(--layout-fit); | 21 @apply(--layout-fit); |
| 22 --paper-header-panel-waterfall-container: { | 22 --paper-header-panel-waterfall-container: { |
| 23 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ | 23 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ |
| 24 overflow-y: overlay; |
| 24 }; | 25 }; |
| 25 -webkit-user-select: none; | 26 -webkit-user-select: none; |
| 26 background-color: var(--settings-background-color); | 27 background-color: var(--settings-background-color); |
| 27 color: var(--paper-grey-800); | 28 color: var(--paper-grey-800); |
| 28 display: flex; | 29 display: flex; |
| 29 flex-direction: column; | 30 flex-direction: column; |
| 30 overflow: hidden; /* Prevent double scroll bar bugs. */ | 31 overflow: hidden; /* Prevent double scroll bar bugs. */ |
| 31 } | 32 } |
| 32 | 33 |
| 33 paper-header-panel { | 34 paper-header-panel { |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 </app-drawer> | 101 </app-drawer> |
| 101 <paper-header-panel mode="waterfall"> | 102 <paper-header-panel mode="waterfall"> |
| 102 <settings-main prefs="{{prefs}}" | 103 <settings-main prefs="{{prefs}}" |
| 103 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 104 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 104 page-visibility="[[pageVisibility_]]"> | 105 page-visibility="[[pageVisibility_]]"> |
| 105 </settings-main> | 106 </settings-main> |
| 106 </paper-header-panel> | 107 </paper-header-panel> |
| 107 </template> | 108 </template> |
| 108 <script src="settings_ui.js"></script> | 109 <script src="settings_ui.js"></script> |
| 109 </dom-module> | 110 </dom-module> |
| OLD | NEW |