| 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_page/settings_router.html"> | |
| 13 <link rel="import" href="/settings_shared_css.html"> | 12 <link rel="import" href="/settings_shared_css.html"> |
| 14 | 13 |
| 15 <dom-module id="settings-ui"> | 14 <dom-module id="settings-ui"> |
| 16 <template> | 15 <template> |
| 17 <style include="settings-shared"> | 16 <style include="settings-shared"> |
| 18 /* TODO(dbeam): remove appeal before launch. */ | 17 /* TODO(dbeam): remove appeal before launch. */ |
| 19 #appeal { | 18 #appeal { |
| 20 align-items: center; | 19 align-items: center; |
| 21 background: rgb(123, 170, 247); | 20 background: rgb(123, 170, 247); |
| 22 display: flex; | 21 display: flex; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 app-drawer .drawer-header { | 103 app-drawer .drawer-header { |
| 105 -webkit-padding-start: 24px; | 104 -webkit-padding-start: 24px; |
| 106 border-bottom: var(--settings-separator-line); | 105 border-bottom: var(--settings-separator-line); |
| 107 } | 106 } |
| 108 | 107 |
| 109 app-drawer .drawer-content { | 108 app-drawer .drawer-content { |
| 110 height: calc(100% - 56px); | 109 height: calc(100% - 56px); |
| 111 overflow: auto; | 110 overflow: auto; |
| 112 } | 111 } |
| 113 </style> | 112 </style> |
| 114 <settings-router current-route="{{currentRoute}}" | |
| 115 current-route-titles="{{currentRouteTitles}}"> | |
| 116 </settings-router> | |
| 117 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully | 113 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully |
| 118 addressed --> | 114 addressed --> |
| 119 <cr-toolbar page-name="$i18n{settings}" | 115 <cr-toolbar page-name="$i18n{settings}" |
| 120 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} | 116 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
| 121 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" | 117 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" |
| 122 spinner-active="[[toolbarSpinnerActive_]]"> | 118 spinner-active="[[toolbarSpinnerActive_]]"> |
| 123 </cr-toolbar> | 119 </cr-toolbar> |
| 124 <app-drawer swipe-open> | 120 <app-drawer swipe-open> |
| 125 <div class="drawer-header">$i18n{settings}</div> | 121 <div class="drawer-header">$i18n{settings}</div> |
| 126 <div class="drawer-content"> | 122 <div class="drawer-content"> |
| 127 <settings-menu current-route="{{currentRoute}}" id="sideNav" | 123 <settings-menu id="sideNav" page-visibility="[[pageVisibility_]]"> |
| 128 page-visibility="[[pageVisibility_]]"> | |
| 129 </settings-menu> | 124 </settings-menu> |
| 130 </div> | 125 </div> |
| 131 </app-drawer> | 126 </app-drawer> |
| 132 <paper-header-panel mode="waterfall"> | 127 <paper-header-panel mode="waterfall"> |
| 133 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" | 128 <settings-main prefs="{{prefs}}" |
| 134 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 129 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 135 page-visibility="[[pageVisibility_]]"> | 130 page-visibility="[[pageVisibility_]]"> |
| 136 </settings-main> | 131 </settings-main> |
| 137 </paper-header-panel> | 132 </paper-header-panel> |
| 138 | 133 |
| 139 <!-- TODO(dbeam): remove before launch. --> | 134 <!-- TODO(dbeam): remove before launch. --> |
| 140 <div id="appeal" hidden="[[appealClosed_]]"> | 135 <div id="appeal" hidden="[[appealClosed_]]"> |
| 141 <span id="request"> | 136 <span id="request"> |
| 142 <h1>Please read: A personal appeal from the Chrome settings team.</h1> | 137 <h1>Please read: A personal appeal from the Chrome settings team.</h1> |
| 143 <a href="[[appealBugUrl_]]">Please file bugs</a> | 138 <a href="[[appealBugUrl_]]">Please file bugs</a> |
| 144 before you | 139 before you |
| 145 <a href="chrome://settings-frame">go back to the old settings</a>. | 140 <a href="chrome://settings-frame">go back to the old settings</a>. |
| 146 </span> | 141 </span> |
| 147 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> | 142 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> |
| 148 </div> | 143 </div> |
| 149 | 144 |
| 150 </template> | 145 </template> |
| 151 <script src="settings_ui.js"></script> | 146 <script src="settings_ui.js"></script> |
| 152 </dom-module> | 147 </dom-module> |
| OLD | NEW |