Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #menuButton { | |
| 15 height: 32px; | |
| 16 margin: 6px 6px 6px 18px; | |
|
dpapad
2016/06/25 01:24:44
This margin does not seem RTL friendly. Should it
tsergeant
2016/06/27 04:57:49
Good point, done.
| |
| 17 min-width: 32px; | |
| 18 padding: 6px; | |
| 19 width: 32px; | |
| 20 } | |
| 21 | |
| 14 h1 { | 22 h1 { |
| 15 @apply(--layout-flex); | 23 @apply(--layout-flex); |
| 16 font-size: 123%; | 24 font-size: 123%; |
| 17 font-weight: 400; | 25 font-weight: 400; |
| 18 } | 26 } |
| 19 | 27 |
| 20 #leftContent { | 28 #leftContent { |
| 21 -webkit-padding-start: 24px; | |
| 22 align-items: center; | 29 align-items: center; |
| 23 display: flex; | 30 display: flex; |
| 24 width: var(--side-bar-width, 0); | |
| 25 } | 31 } |
| 26 | 32 |
| 27 #centeredContent { | 33 #centeredContent { |
| 28 -webkit-padding-end: 12px; | 34 -webkit-padding-end: 12px; |
| 29 display: flex; | 35 display: flex; |
| 30 flex: 1 1 0; | 36 flex: 1 1 0; |
| 31 justify-content: center; | 37 justify-content: center; |
| 32 } | 38 } |
| 33 | 39 |
| 34 :host([narrow_]) #centeredContent { | 40 :host([narrow_]) #centeredContent { |
| 35 justify-content: flex-end; | 41 justify-content: flex-end; |
| 36 } | 42 } |
| 37 | 43 |
| 38 :host([narrow_][showing-search_]) #leftContent { | 44 :host([narrow_][showing-search_]) #leftContent { |
| 39 display: none; | 45 display: none; |
| 40 } | 46 } |
| 41 </style> | 47 </style> |
| 42 <div id="leftContent"> | 48 <div id="leftContent"> |
| 43 <content select="paper-icon-button"></content> | 49 <paper-icon-button id="menuButton" icon="cr:menu" on-tap="onMenuTap_"> |
|
dpapad
2016/06/25 01:24:44
Need to add an HTML import for paper-icon-button.
tsergeant
2016/06/27 04:57:49
Done.
| |
| 50 </paper-icon-button> | |
| 44 <h1>[[pageName]]</h1> | 51 <h1>[[pageName]]</h1> |
| 45 </div> | 52 </div> |
| 46 | 53 |
| 47 <div id="centeredContent"> | 54 <div id="centeredContent"> |
| 48 <cr-toolbar-search-field id="search" narrow="[[narrow_]]" | 55 <cr-toolbar-search-field id="search" narrow="[[narrow_]]" |
| 49 label="[[searchPrompt]]" clear-label="[[clearLabel]]" | 56 label="[[searchPrompt]]" clear-label="[[clearLabel]]" |
| 50 spinner-active="[[spinnerActive]]" | 57 spinner-active="[[spinnerActive]]" |
| 51 showing-search="{{showingSearch_}}"> | 58 showing-search="{{showingSearch_}}"> |
| 52 </cr-toolbar-search-field> | 59 </cr-toolbar-search-field> |
| 53 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}"> | 60 <iron-media-query query="(max-width: 900px)" query-matches="{{narrow_}}"> |
| 54 </iron-media-query> | 61 </iron-media-query> |
| 55 </div> | 62 </div> |
| 56 </template> | 63 </template> |
| 57 <script src="cr_toolbar.js"></script> | 64 <script src="cr_toolbar.js"></script> |
| 58 </dom-module> | 65 </dom-module> |
| OLD | NEW |