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"> |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 height: calc(100% - 56px); | 110 height: calc(100% - 56px); |
111 overflow: auto; | 111 overflow: auto; |
112 } | 112 } |
113 </style> | 113 </style> |
114 <settings-router current-route="{{currentRoute}}" | 114 <settings-router current-route="{{currentRoute}}" |
115 current-route-titles="{{currentRouteTitles}}"> | 115 current-route-titles="{{currentRouteTitles}}"> |
116 </settings-router> | 116 </settings-router> |
117 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully | 117 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully |
118 addressed --> | 118 addressed --> |
119 <cr-toolbar page-name="$i18n{settings}" | 119 <cr-toolbar page-name="$i18n{settings}" |
120 hide-search="[[pageVisibility_.hideToolbarSearchField]]" | |
dpapad
2016/07/21 18:33:33
Did you move the cr-toolbar changes to a different
Moe
2016/07/22 16:59:56
done.
| |
120 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} | 121 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
121 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" | 122 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" |
122 spinner-active="[[toolbarSpinnerActive_]]"> | 123 spinner-active="[[toolbarSpinnerActive_]]"> |
123 </cr-toolbar> | 124 </cr-toolbar> |
124 <app-drawer swipe-open> | 125 <app-drawer swipe-open> |
125 <div class="drawer-header">$i18n{settings}</div> | 126 <div class="drawer-header">$i18n{settings}</div> |
126 <div class="drawer-content"> | 127 <div class="drawer-content"> |
127 <settings-menu current-route="{{currentRoute}}" id="sideNav"> | 128 <settings-menu current-route="{{currentRoute}}" id="sideNav" |
129 page-visibility="[[pageVisibility_]]"> | |
128 </settings-menu> | 130 </settings-menu> |
129 </div> | 131 </div> |
130 </app-drawer> | 132 </app-drawer> |
131 <paper-header-panel mode="waterfall"> | 133 <paper-header-panel mode="waterfall"> |
132 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" | 134 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" |
133 toolbar-spinner-active="{{toolbarSpinnerActive_}}"> | 135 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
136 page-visibility="[[pageVisibility_]]"> | |
134 </settings-main> | 137 </settings-main> |
135 </paper-header-panel> | 138 </paper-header-panel> |
136 | 139 |
137 <!-- TODO(dbeam): remove before launch. --> | 140 <!-- TODO(dbeam): remove before launch. --> |
138 <div id="appeal" hidden="[[appealClosed_]]"> | 141 <div id="appeal" hidden="[[appealClosed_]]"> |
139 <span id="request"> | 142 <span id="request"> |
140 <h1>Please read: A personal appeal from the Chrome settings team.</h1> | 143 <h1>Please read: A personal appeal from the Chrome settings team.</h1> |
141 <a href="[[appealBugUrl_]]">Please file bugs</a> | 144 <a href="[[appealBugUrl_]]">Please file bugs</a> |
142 before you | 145 before you |
143 <a href="chrome://settings-frame">go back to the old settings</a>. | 146 <a href="chrome://settings-frame">go back to the old settings</a>. |
144 </span> | 147 </span> |
145 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> | 148 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> |
146 </div> | 149 </div> |
147 | 150 |
148 </template> | 151 </template> |
149 <script src="settings_ui.js"></script> | 152 <script src="settings_ui.js"></script> |
150 </dom-module> | 153 </dom-module> |
OLD | NEW |