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

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

Issue 2235793002: MD Settings: remove appeal and (Coming soon) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_ui/settings_ui.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 /* TODO(dbeam): remove appeal before launch. */
18 #appeal {
19 align-items: center;
20 background: rgb(123, 170, 247);
21 display: flex;
22 }
23
24 #request {
25 flex: 1;
26 font-size: .8125rem;
27 font-weight: bold;
28 padding: 8px 24px;
29 }
30
31 #request h1 {
32 font-size: 1rem;
33 margin: 0;
34 }
35
36 #request a {
37 color: rgb(100, 100, 255);
38 }
39
40 #close {
41 padding: 20px;
42 }
43
44 :host { 17 :host {
45 @apply(--layout-fit); 18 @apply(--layout-fit);
46 --paper-header-panel-waterfall-container: { 19 --paper-header-panel-waterfall-container: {
47 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */ 20 overflow-x: auto; /* Undo paper-header-panel default of 'hidden'. */
48 }; 21 };
49 -webkit-user-select: none; 22 -webkit-user-select: none;
50 background-color: var(--settings-background-color); 23 background-color: var(--settings-background-color);
51 display: flex; 24 display: flex;
52 flex-direction: column; 25 flex-direction: column;
53 } 26 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 app-drawer .drawer-header { 76 app-drawer .drawer-header {
104 -webkit-padding-start: 24px; 77 -webkit-padding-start: 24px;
105 border-bottom: var(--settings-separator-line); 78 border-bottom: var(--settings-separator-line);
106 } 79 }
107 80
108 app-drawer .drawer-content { 81 app-drawer .drawer-content {
109 height: calc(100% - 56px); 82 height: calc(100% - 56px);
110 overflow: auto; 83 overflow: auto;
111 } 84 }
112 </style> 85 </style>
113 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully 86 <cr-toolbar page-name="$i18n{settings}" clear-label="$i18n{clearSearch}"
114 addressed --> 87 search-prompt="$i18n{searchPrompt}" on-cr-menu-tap="onMenuButtonTap_"
115 <cr-toolbar page-name="$i18n{settings}"
116 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt}
117 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_"
118 spinner-active="[[toolbarSpinnerActive_]]"> 88 spinner-active="[[toolbarSpinnerActive_]]">
119 </cr-toolbar> 89 </cr-toolbar>
120 <app-drawer swipe-open> 90 <app-drawer swipe-open>
121 <div class="drawer-header">$i18n{settings}</div> 91 <div class="drawer-header">$i18n{settings}</div>
122 <div class="drawer-content"> 92 <div class="drawer-content">
123 <settings-menu id="sideNav" page-visibility="[[pageVisibility_]]"> 93 <settings-menu id="sideNav" page-visibility="[[pageVisibility_]]">
124 </settings-menu> 94 </settings-menu>
125 </div> 95 </div>
126 </app-drawer> 96 </app-drawer>
127 <paper-header-panel mode="waterfall"> 97 <paper-header-panel mode="waterfall">
128 <settings-main prefs="{{prefs}}" 98 <settings-main prefs="{{prefs}}"
129 toolbar-spinner-active="{{toolbarSpinnerActive_}}" 99 toolbar-spinner-active="{{toolbarSpinnerActive_}}"
130 page-visibility="[[pageVisibility_]]"> 100 page-visibility="[[pageVisibility_]]">
131 </settings-main> 101 </settings-main>
132 </paper-header-panel> 102 </paper-header-panel>
133
134 <!-- TODO(dbeam): remove before launch. -->
135 <div id="appeal" hidden="[[appealClosed_]]">
136 <span id="request">
137 <h1>Please read: A personal appeal from the Chrome settings team.</h1>
138 <a href="[[appealBugUrl_]]">Please file bugs</a>
139 before you
140 <a href="chrome://settings-frame">go back to the old settings</a>.
141 </span>
142 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">&#x2715;</span>
143 </div>
144
145 </template> 103 </template>
146 <script src="settings_ui.js"></script> 104 <script src="settings_ui.js"></script>
147 </dom-module> 105 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/settings_ui/settings_ui.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698