Chromium Code Reviews| 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/iron-icon/iron-icon.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 9 <link rel="import" href="/direction_delegate.html"> | 9 <link rel="import" href="/direction_delegate.html"> |
| 10 <link rel="import" href="/i18n_setup.html"> | 10 <link rel="import" href="/i18n_setup.html"> |
| 11 <link rel="import" href="/icons.html"> | 11 <link rel="import" href="/icons.html"> |
| 12 <link rel="import" href="/settings_main/settings_main.html"> | 12 <link rel="import" href="/settings_main/settings_main.html"> |
| 13 <link rel="import" href="/settings_menu/settings_menu.html"> | 13 <link rel="import" href="/settings_menu/settings_menu.html"> |
| 14 <link rel="import" href="/settings_page/settings_router.html"> | 14 <link rel="import" href="/settings_page/settings_router.html"> |
| 15 <link rel="import" href="/settings_shared_css.html"> | 15 <link rel="import" href="/settings_shared_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: { | |
| 23 overflow-x: auto; | |
|
tommycli
2016/06/28 23:29:27
Since not immediately obvious, I just recommend a
dschuyler
2016/06/28 23:34:31
Done.
| |
| 24 }; | |
| 22 -webkit-user-select: none; | 25 -webkit-user-select: none; |
| 23 background-color: var(--settings-background-color); | 26 background-color: var(--settings-background-color); |
| 24 display: flex; | 27 display: flex; |
| 25 flex-direction: column; | 28 flex-direction: column; |
| 26 } | 29 } |
| 27 | 30 |
| 28 paper-header-panel { | 31 paper-header-panel { |
| 29 --paper-header-panel-shadow: { | 32 --paper-header-panel-shadow: { |
| 30 z-index: 2; | 33 z-index: 2; |
| 31 }; | 34 }; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 </settings-menu> | 105 </settings-menu> |
| 103 </div> | 106 </div> |
| 104 </app-drawer> | 107 </app-drawer> |
| 105 <paper-header-panel mode="waterfall"> | 108 <paper-header-panel mode="waterfall"> |
| 106 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 109 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 107 </settings-main> | 110 </settings-main> |
| 108 </paper-header-panel> | 111 </paper-header-panel> |
| 109 </template> | 112 </template> |
| 110 <script src="settings_ui.js"></script> | 113 <script src="settings_ui.js"></script> |
| 111 </dom-module> | 114 </dom-module> |
| OLD | NEW |