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-list/iron-list.htm l"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> |
| 5 <link rel="import" href="chrome://resources/html/cr/ui/position_util.html"> | 5 <link rel="import" href="chrome://resources/html/cr/ui/position_util.html"> |
| 6 <link rel="import" href="chrome://history/history_card.html"> | 6 <link rel="import" href="chrome://history/history_item.html"> |
| 7 | 7 |
| 8 <dom-module id="history-card-manager"> | 8 <dom-module id="history-list"> |
| 9 <template> | 9 <template> |
| 10 <style> | 10 <style> |
| 11 :host { | 11 :host { |
| 12 display: flex; | 12 display: flex; |
| 13 flex-direction: column; | 13 flex-direction: column; |
| 14 } | 14 } |
| 15 | 15 |
| 16 :host([menu-open]) #overflow-menu { | |
| 17 display: block; | |
| 18 } | |
| 19 | |
| 20 #overflow-menu { | 16 #overflow-menu { |
| 21 @apply(--shadow-elevation-2dp); | 17 @apply(--shadow-elevation-2dp); |
| 22 border-radius: 2px; | 18 border-radius: 2px; |
| 23 display: none; | 19 display: none; |
| 24 left: 0; | 20 left: 0; |
| 25 position: absolute; | 21 position: absolute; |
| 26 top: 0; | 22 top: 0; |
| 27 } | 23 } |
| 28 | 24 |
| 25 :host([menu-open]) #overflow-menu { | |
| 26 display: block; | |
| 27 } | |
| 28 | |
|
calamity
2016/02/09 12:25:29
This block seems to have moved. May as well leave
yingran
2016/02/11 00:41:42
am confused
tsergeant
2016/02/11 02:43:02
My $0.02: Leave this block where it is now. It mod
yingran
2016/02/12 02:03:05
Done.
| |
| 29 #infinite-list { | 29 #infinite-list { |
| 30 flex: 1; | 30 flex: 1; |
| 31 padding: 40px 0 0 0; | 31 padding: 20px 0 0 0; |
| 32 } | 32 } |
| 33 | 33 |
| 34 paper-item { | 34 paper-item { |
| 35 -webkit-user-select: none; | 35 -webkit-user-select: none; |
| 36 cursor: pointer; | 36 cursor: pointer; |
| 37 font: inherit; | 37 font: inherit; |
| 38 } | 38 } |
| 39 | 39 |
| 40 paper-item:hover { | 40 paper-item:hover { |
| 41 background: #eaeaea; | 41 background: #eaeaea; |
| 42 } | 42 } |
| 43 </style> | 43 </style> |
| 44 <iron-list items="{{historyDataByDay_}}" as="historyDay" id="infinite-list" | 44 <iron-list items="{{historyData}}" as="historyDay" id="infinite-list" |
| 45 on-scroll="scrollHandler_"> | 45 on-scroll="scrollHandler_"> |
| 46 <template> | 46 <template> |
| 47 <history-card history-date="{{historyDay.date}}" | 47 <history-item history-date="[[historyDay.dateRelativeDay]]" |
| 48 history-items="{{historyDay.historyItems}}"> | 48 website-title="[[historyDay.title]]" |
| 49 </history-card> | 49 website-url="[[historyDay.url]]" |
| 50 website-domain="[[historyDay.domain]]" | |
| 51 time-accessed="[[historyDay.dateTimeOfDay]]" | |
| 52 starred="[[historyDay.starred]]" | |
| 53 timestamp="[[historyDay.time]]" | |
| 54 selected="{{historyDay.selected}}" | |
| 55 is-card-start="[[historyDay.isFirstItem]]" | |
| 56 is-card-end="[[historyDay.isLastItem]]" | |
| 57 has-time-gap="[[historyDay.needsTimeGap]]"> | |
| 58 </history-item> | |
| 50 </template> | 59 </template> |
| 51 </iron-list> | 60 </iron-list> |
| 52 <paper-menu id="overflow-menu"> | 61 <paper-menu id="overflow-menu"> |
| 53 <paper-item i18n-content="moreFromSite" on-tap="onMoreFromSiteTap_"> | 62 <paper-item i18n-content="moreFromSite" on-tap="onMoreFromSiteTap_"> |
| 54 </paper-item> | 63 </paper-item> |
| 55 <paper-item i18n-content="removeFromHistory" | 64 <paper-item i18n-content="removeFromHistory" |
| 56 on-tap="onRemoveFromHistoryTap_"> | 65 on-tap="onRemoveFromHistoryTap_"> |
| 57 </paper-item> | 66 </paper-item> |
| 58 </paper-menu> | 67 </paper-menu> |
| 59 </template> | 68 </template> |
| 60 <script src="chrome://history/history_card_manager.js"></script> | 69 <script src="chrome://history/history_list.js"></script> |
| 61 </dom-module> | 70 </dom-module> |
| OLD | NEW |