Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> |
| 4 <link rel="import" href="chrome://history/history_item.html"> | 4 <link rel="import" href="chrome://history/history_item.html"> |
| 5 | 5 |
| 6 <dom-module id="history-card"> | 6 <dom-module id="history-card"> |
| 7 <template> | 7 <template> |
| 8 <style> | 8 <style> |
| 9 :host { | 9 :host { |
| 10 @apply(--layout-center); | 10 @apply(--layout-center); |
| 11 @apply(--layout-vertical); | 11 @apply(--layout-vertical); |
| 12 padding: 0 24px 20px; | 12 padding: 0 24px 20px; |
| 13 } | 13 } |
| 14 | 14 |
| 15 :host([hidden]) { | |
| 16 display: none !important; | |
| 17 } | |
| 18 | |
| 15 #main-container { | 19 #main-container { |
| 16 @apply(--shadow-elevation-2dp); | 20 @apply(--shadow-elevation-2dp); |
| 17 background: #fff; | 21 background: #fff; |
| 18 border-radius: 2px; | 22 border-radius: 2px; |
| 19 max-width: 960px; | 23 max-width: 960px; |
| 20 width: 100%; | 24 width: 100%; |
| 21 } | 25 } |
| 22 | 26 |
| 23 #time-gap-separator { | 27 #time-gap-separator { |
| 24 -webkit-border-start: 1px solid #888; | 28 -webkit-border-start: 1px solid #888; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 38 font-weight: 500; | 42 font-weight: 500; |
| 39 height: 48px; | 43 height: 48px; |
| 40 } | 44 } |
| 41 | 45 |
| 42 #history-item-list { | 46 #history-item-list { |
| 43 padding: 8px 0; | 47 padding: 8px 0; |
| 44 } | 48 } |
| 45 </style> | 49 </style> |
| 46 | 50 |
| 47 <div id="main-container"> | 51 <div id="main-container"> |
| 48 <div id="date-accessed">[[historyDate]]</div> | 52 <div id="date-accessed"> |
| 53 {{searchResultTitle_(historyItems.length, searchTerm, historyDate)}} | |
|
tsergeant
2016/02/04 02:28:49
Can you rename searchResultTitle to cardTitle or s
hsampson
2016/02/08 04:40:22
Done.
| |
| 54 </div> | |
| 49 <div id="history-item-list"> | 55 <div id="history-item-list"> |
| 50 <template is="dom-repeat" items="[[historyItems]]" | 56 <template is="dom-repeat" items="[[historyItems]]" |
|
tsergeant
2016/02/04 02:28:49
Make sure this is rebased correctly, so that bug d
hsampson
2016/02/08 04:40:22
Done.
| |
| 51 as="historyItem"> | 57 as="historyItem"> |
| 52 <history-item time-accessed_="[[historyItem.dateTimeOfDay]]" | 58 <history-item time-accessed_="[[historyItem.dateTimeOfDay]]" |
| 53 website-title_="[[historyItem.title]]" | 59 website-title_="[[historyItem.title]]" |
| 54 website-domain_="[[historyItem.domain]]" | 60 website-domain_="[[historyItem.domain]]" |
| 55 website-url_="[[historyItem.url]]" | 61 website-url_="[[historyItem.url]]" |
| 56 starred="[[historyItem.starred]]" | 62 starred="[[historyItem.starred]]" |
| 57 selected="{{historyItem.selected}}" | 63 selected="{{historyItem.selected}}" |
| 58 timestamp_="[[historyItem.time]]"> | 64 timestamp_="[[historyItem.time]]" |
| 65 search-term="[[searchTerm]]"> | |
| 59 </history-item> | 66 </history-item> |
| 60 <template is="dom-if" if="[[needsTimeGap_(index, historyItem)]]"> | 67 <template is="dom-if" if="[[needsTimeGap_(index, historyItem, searchTe rm)]]"> |
| 61 <div id="time-gap-separator"></div> | 68 <div id="time-gap-separator"></div> |
| 62 </template> | 69 </template> |
| 63 </template> | 70 </template> |
| 64 </div> | 71 </div> |
| 65 </div> | 72 </div> |
| 66 </template> | 73 </template> |
| 67 <script src="chrome://history/history_card.js"></script> | 74 <script src="chrome://history/history_card.js"></script> |
| 68 </dom-module> | 75 </dom-module> |
| OLD | NEW |