Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: chrome/browser/resources/settings/settings_ui/settings_ui.html

Issue 2108863004: MD Settings: move appeal into flow to unhide Advanced toggle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 /* TODO(dbeam): remove appeal before launch. */
21 #appeal {
22 align-items: center;
23 background: rgb(123, 170, 247);
24 display: flex;
25 }
26
27 #request {
28 flex: 1;
29 font-size: .8125rem;
30 font-weight: bold;
31 padding: 8px 24px;
32 }
33
34 #request h1 {
35 font-size: 1rem;
36 margin: 0;
37 }
38
39 #request a {
40 color: rgb(100, 100, 255);
41 }
42
43 #close {
44 padding: 20px;
45 }
46
20 :host { 47 :host {
21 @apply(--layout-fit); 48 @apply(--layout-fit);
22 -webkit-user-select: none; 49 -webkit-user-select: none;
23 background-color: var(--settings-background-color); 50 background-color: var(--settings-background-color);
24 display: flex; 51 display: flex;
25 flex-direction: column; 52 flex-direction: column;
26 } 53 }
27 54
28 paper-header-panel { 55 paper-header-panel {
29 --paper-header-panel-shadow: { 56 --paper-header-panel-shadow: {
30 z-index: 2; 57 z-index: 2;
31 }; 58 };
59 flex: 1;
32 } 60 }
33 61
34 .heading { 62 .heading {
35 -webkit-margin-start: 8px; 63 -webkit-margin-start: 8px;
36 } 64 }
37 65
38 .paper-header { 66 .paper-header {
39 -webkit-padding-start: 24px; 67 -webkit-padding-start: 24px;
40 align-items: center; 68 align-items: center;
41 border-bottom: var(--settings-separator-line); 69 border-bottom: var(--settings-separator-line);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 <div class="drawer-header">$i18n{settings}</div> 127 <div class="drawer-header">$i18n{settings}</div>
100 <div class="drawer-content"> 128 <div class="drawer-content">
101 <settings-menu current-route="{{currentRoute}}" id="sideNav"> 129 <settings-menu current-route="{{currentRoute}}" id="sideNav">
102 </settings-menu> 130 </settings-menu>
103 </div> 131 </div>
104 </app-drawer> 132 </app-drawer>
105 <paper-header-panel mode="waterfall"> 133 <paper-header-panel mode="waterfall">
106 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> 134 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}">
107 </settings-main> 135 </settings-main>
108 </paper-header-panel> 136 </paper-header-panel>
137
138 <!-- TODO(dbeam): remove before launch. -->
139 <div id="appeal" hidden="[[appealClosed_]]">
140 <span id="request">
141 <h1>Please read: A personal appeal from the Chrome settings team.</h1>
142 <a href="https://goo.gl/btju6c">Please file bugs</a>
143 before you
144 <a href="chrome://settings-frame">go back to the old settings</a>.
145 </span>
146 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">&#x2715;</span>
147 </div>
148
109 </template> 149 </template>
110 <script src="settings_ui.js"></script> 150 <script src="settings_ui.js"></script>
111 </dom-module> 151 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings.js ('k') | chrome/browser/resources/settings/settings_ui/settings_ui.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698