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: ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html

Issue 2064013002: MD Settings: Replace current toolbar with cr-toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@search_box1
Patch Set: Remove paper-input obsolete CSS. Created 4 years, 6 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-media-query/iron-m edia-query.html">
3 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar_se arch_field.html"> 3 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar_se arch_field.html">
4 4
5 <dom-module id="cr-toolbar"> 5 <dom-module id="cr-toolbar">
6 <template> 6 <template>
7 <style> 7 <style>
8 :host { 8 :host {
9 color: #fff; 9 color: #fff;
10 display: flex; 10 display: flex;
11 height: 56px; 11 height: 56px;
12 } 12 }
13 13
14 h1 { 14 h1 {
15 @apply(--layout-flex); 15 @apply(--layout-flex);
16 -webkit-padding-start: 24px;
17 font-size: 123%; 16 font-size: 123%;
18 font-weight: 400; 17 font-weight: 400;
19 } 18 }
20 19
21 #leftContent { 20 #leftContent {
21 -webkit-padding-start: 24px;
tsergeant 2016/06/21 00:04:30 Eyeballing your screenshots, it looks like there's
22 align-items: center; 22 align-items: center;
23 display: flex; 23 display: flex;
24 width: var(--side-bar-width, 0); 24 width: var(--side-bar-width, 0);
25 } 25 }
26 26
27 #centeredContent { 27 #centeredContent {
28 -webkit-padding-end: 12px; 28 -webkit-padding-end: 12px;
29 display: flex; 29 display: flex;
30 flex: 1 1 0; 30 flex: 1 1 0;
31 justify-content: center; 31 justify-content: center;
32 } 32 }
33 33
34 :host([narrow_]) #centeredContent { 34 :host([narrow_]) #centeredContent {
35 justify-content: flex-end; 35 justify-content: flex-end;
36 } 36 }
37 37
38 :host([narrow_][showing-search_]) #leftContent { 38 :host([narrow_][showing-search_]) #leftContent {
39 display: none; 39 display: none;
40 } 40 }
41 </style> 41 </style>
42 <div id="leftContent"> 42 <div id="leftContent">
43 <content select="paper-icon-button"></content>
dschuyler 2016/06/20 23:37:59 Can we go with a more specific selector, such as
dpapad 2016/06/20 23:55:07 From the cr-toolbar's point of view, there is no a
43 <h1>[[pageName]]</h1> 44 <h1>[[pageName]]</h1>
44 </div> 45 </div>
45 46
46 <div id="centeredContent"> 47 <div id="centeredContent">
47 <cr-toolbar-search-field id="search" narrow="[[narrow_]]" 48 <cr-toolbar-search-field id="search" narrow="[[narrow_]]"
48 label="[[searchPrompt]]" clear-label="[[clearLabel]]" 49 label="[[searchPrompt]]" clear-label="[[clearLabel]]"
49 spinner-active="[[spinnerActive]]" 50 spinner-active="[[spinnerActive]]"
50 showing-search="{{showingSearch_}}"> 51 showing-search="{{showingSearch_}}">
51 </cr-toolbar-search-field> 52 </cr-toolbar-search-field>
52 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}"> 53 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}">
53 </iron-media-query> 54 </iron-media-query>
54 </div> 55 </div>
55 </template> 56 </template>
56 <script src="cr_toolbar.js"></script> 57 <script src="cr_toolbar.js"></script>
57 </dom-module> 58 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698