| 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 | 13 |
| 14 <dom-module id="settings-ui"> | 14 <dom-module id="settings-ui"> |
| 15 <template> | 15 <template> |
| 16 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| 17 :host { | 17 :host { |
| 18 @apply(--layout-fit); | 18 @apply(--layout-fit); |
| 19 --paper-header-panel-waterfall-container: { | 19 --paper-header-panel-waterfall-container: { |
| 20 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ | 20 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ |
| 21 }; | 21 }; |
| 22 -webkit-user-select: none; | 22 -webkit-user-select: none; |
| 23 background-color: var(--settings-background-color); | 23 background-color: var(--settings-background-color); |
| 24 display: flex; | 24 display: flex; |
| 25 flex-direction: column; | 25 flex-direction: column; |
| 26 overflow: hidden; /* Prevent double scroll bar bugs. */ |
| 26 } | 27 } |
| 27 | 28 |
| 28 paper-header-panel { | 29 paper-header-panel { |
| 29 --paper-header-panel-shadow: { | 30 --paper-header-panel-shadow: { |
| 30 z-index: 3; | 31 z-index: 3; |
| 31 }; | 32 }; |
| 32 flex: 1; | 33 flex: 1; |
| 33 } | 34 } |
| 34 | 35 |
| 35 .paper-header { | 36 .paper-header { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 </app-drawer> | 98 </app-drawer> |
| 98 <paper-header-panel mode="waterfall"> | 99 <paper-header-panel mode="waterfall"> |
| 99 <settings-main prefs="{{prefs}}" | 100 <settings-main prefs="{{prefs}}" |
| 100 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 101 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 101 page-visibility="[[pageVisibility_]]"> | 102 page-visibility="[[pageVisibility_]]"> |
| 102 </settings-main> | 103 </settings-main> |
| 103 </paper-header-panel> | 104 </paper-header-panel> |
| 104 </template> | 105 </template> |
| 105 <script src="settings_ui.js"></script> | 106 <script src="settings_ui.js"></script> |
| 106 </dom-module> | 107 </dom-module> |
| OLD | NEW |