Chromium Code Reviews| Index: chrome/browser/resources/md_history/history_item.html |
| diff --git a/chrome/browser/resources/md_history/history_item.html b/chrome/browser/resources/md_history/history_item.html |
| index 26bee11f15b8671a5859d7ce518c5184c44ebb04..8997098e4878a7afc252a1b4829c87eac7f52c63 100644 |
| --- a/chrome/browser/resources/md_history/history_item.html |
| +++ b/chrome/browser/resources/md_history/history_item.html |
| @@ -1,20 +1,67 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html"> |
| <link rel="import" href="chrome://resources/html/util.html"> |
| <dom-module id="history-item"> |
| <template> |
| <style> |
| + :host { |
| + @apply(--layout-center); |
| + @apply(--layout-vertical); |
| + padding: 0 24px; |
| + } |
| + |
| #main-container { |
| + background: #fff; |
| + max-width: 960px; |
| + width: 100%; |
| + } |
| + |
| + :host([is-first-card]) #main-container { |
| + margin-top: 20px; |
| + } |
| + |
| + #date-accessed { |
| + display: none; |
| + } |
| + |
| + :host([is-first-card]) #date-accessed { |
| + @apply(--layout-center); |
| + @apply(--layout-horizontal); |
| + -webkit-padding-start: 20px; |
| + background: #fafafa; |
| + border-bottom: 1px solid rgba(0, 0, 0, 0.14); |
| + border-radius: 2px 2px 0 0; |
| + color: #333; |
| + font-size: 14px; |
| + font-weight: 500; |
| + height: 48px; |
| + } |
| + |
| + #item-container { |
| @apply(--layout-center); |
| @apply(--layout-horizontal); |
| min-height: 40px; |
| } |
| + :host([is-first-card]) #item-container { |
| + padding: 8px 0 0 0; |
|
tsergeant
2016/02/02 05:58:00
If you use padding-top here...
yingran
2016/02/02 06:49:10
Done.
|
| + } |
| + |
| + :host([is-last-card]) #item-container { |
| + padding: 0 0 8px 0; |
|
tsergeant
2016/02/02 05:58:00
And padding-bottom here...
yingran
2016/02/02 06:49:10
Done.
|
| + } |
| + |
| + :host([is-first-card][is-last-card]) #item-container { |
|
tsergeant
2016/02/02 05:58:00
Then can you get rid of this block?
yingran
2016/02/02 06:49:10
Done.
|
| + padding: 8px 0; |
| + } |
| + |
| paper-checkbox { |
| --paper-checkbox-checked-color: rgb(68, 136, 255); |
| --paper-checkbox-size: 16px; |
| @@ -77,22 +124,30 @@ |
| visibility: hidden; |
| } |
| - :host([starred]) #bookmark { |
| - visibility: visible; |
| + #time-gap-separator { |
| + -webkit-border-start: 1px solid #888; |
| + -webkit-margin-start: 77px; |
| + height: 15px; |
| } |
| </style> |
| + |
| <div id="main-container"> |
| - <paper-checkbox id="checkbox" on-tap="onCheckboxSelected_" |
| - checked="{{selected}}"> |
| - </paper-checkbox> |
| - <span id="time">{{timeAccessed_}}</span> |
| - <div id="website-icon"></div> |
| - <a href="{{websiteUrl_}}" id="title">{{websiteTitle_}}</a> |
| - <span id="domain">{{websiteDomain_}}</span> |
| - <iron-icon icon="star" id="bookmark"></iron-icon> |
| - <paper-icon-button icon="more-vert" id="menu-button" |
| - on-tap="onMenuButtonTap_"> |
| - </paper-icon-button> |
| + <div id="date-accessed">[[historyDate]]</div> |
|
tsergeant
2016/02/02 05:58:00
Consider using
<div id="date-accessed" hidden$="{
yingran
2016/02/02 06:49:10
Acknowledged.
|
| + <div id="item-container"> |
| + <paper-checkbox id="checkbox" on-tap="checkboxSelected" |
| + checked="{{selected}}"> |
| + </paper-checkbox> |
| + <span id="time">{{timeAccessed}}</span> |
| + <div id="website-icon"></div> |
| + <a href="{{websiteUrl}}" id="title">{{websiteTitle}}</a> |
| + <span id="domain">{{websiteDomain}}</span> |
| + <iron-icon icon="star" id="bookmark"></iron-icon> |
| + <paper-icon-button icon="more-vert" id="menu-button" on-tap="openMenu"> |
| + </paper-icon-button> |
| + </div> |
| + <template is="dom-if" if="{{hasTimeGap}}"> |
| + <div id="time-gap-separator"></div> |
| + </template> |
| </div> |
| </template> |
| <script src="chrome://history/history_item.js"></script> |