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

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

Issue 1952493002: MD Settings: Proof of concept, highlighting search matches across Shadow DOM boundaries. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape r-drawer-panel.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape r-drawer-panel.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too lbar.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too lbar.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
10 <link rel="import" href="chrome://md-settings/direction_delegate.html"> 10 <link rel="import" href="chrome://md-settings/direction_delegate.html">
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 } 139 }
140 140
141 .heading { 141 .heading {
142 -webkit-margin-start: 8px; 142 -webkit-margin-start: 8px;
143 } 143 }
144 144
145 paper-drawer-panel:not([narrow]) #main-title { 145 paper-drawer-panel:not([narrow]) #main-title {
146 display: none; 146 display: none;
147 } 147 }
148 148
149 paper-icon-button[toggles]:not([active]) + #search-input { 149 paper-icon-button[toggles]:not([active]) + #searchInput {
150 display: none; 150 display: none;
151 } 151 }
152 152
153 .last { 153 .last {
154 display: flex; 154 display: flex;
155 justify-content: flex-end; 155 justify-content: flex-end;
156 width: 100%; 156 width: 100%;
157 } 157 }
158 </style> 158 </style>
159 <settings-router current-route="{{currentRoute}}" 159 <settings-router current-route="{{currentRoute}}"
(...skipping 12 matching lines...) Expand all
172 <paper-toolbar class="toolbar"> 172 <paper-toolbar class="toolbar">
173 <paper-icon-button icon="settings:menu" id="menu-button" 173 <paper-icon-button icon="settings:menu" id="menu-button"
174 paper-drawer-toggle> 174 paper-drawer-toggle>
175 </paper-icon-button> 175 </paper-icon-button>
176 <div class="heading" id="main-title"> 176 <div class="heading" id="main-title">
177 $i18n{settings} 177 $i18n{settings}
178 </div> 178 </div>
179 <div class="last"> 179 <div class="last">
180 <paper-icon-button icon="cr:search" toggles> 180 <paper-icon-button icon="cr:search" toggles>
181 </paper-icon-button> 181 </paper-icon-button>
182 <paper-input id="search-input" label="$i18n{internalSearch}" 182 <paper-input id="searchInput" type="search"
183 no-label-float> 183 label="$i18n{internalSearch}" no-label-float>
184 <!-- TODO(dschuyler): implement internal search. --> 184 <paper-icon-button suffix icon="cr:cancel"
185 <paper-icon-button suffix icon="cr:cancel"> 185 on-tap="onCancelSearchTap_"></paper-icon-button>
186 </paper-icon-button>
187 </paper-input> 186 </paper-input>
188 </div> 187 </div>
189 </paper-toolbar> 188 </paper-toolbar>
190 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> 189 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}">
191 </settings-main> 190 </settings-main>
192 </paper-header-panel> 191 </paper-header-panel>
193 </paper-drawer-panel> 192 </paper-drawer-panel>
194 </template> 193 </template>
195 <script src="settings_ui.js"></script> 194 <script src="settings_ui.js"></script>
195 <script src="chrome://md-settings/search_settings.js"></script>
196 </dom-module> 196 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('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