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-icon/iron-icon.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> | |
| 7 <link rel="import" href="chrome://resources/html/util.html"> | 9 <link rel="import" href="chrome://resources/html/util.html"> |
| 8 | 10 |
| 9 <dom-module id="history-item"> | 11 <dom-module id="history-item"> |
| 10 <template> | 12 <template> |
| 11 <style> | 13 <style> |
| 14 :host { | |
| 15 @apply(--layout-center); | |
| 16 @apply(--layout-vertical); | |
| 17 padding: 0 24px; | |
| 18 } | |
| 19 | |
| 12 #main-container { | 20 #main-container { |
| 21 background: #fff; | |
| 22 border-left: 1px solid rgba(0, 0, 0, 0.14); | |
|
tsergeant
2016/02/08 03:44:51
Split this apart to reduce duplication:
border-co
yingran
2016/02/11 00:41:42
Done.
| |
| 23 border-right: 1px solid rgba(0, 0, 0, 0.14); | |
| 24 max-width: 960px; | |
| 25 min-width: 500px; | |
| 26 width: 100%; | |
| 27 } | |
| 28 | |
| 29 :host([is-card-start]) #main-container { | |
| 30 border-top: 1px solid rgba(0, 0, 0, 0.14); | |
| 31 margin-top: 20px; | |
| 32 } | |
| 33 | |
| 34 :host([is-card-end]) #main-container { | |
| 35 border-bottom: 2px solid rgba(0, 0, 0, 0.14); | |
| 36 } | |
| 37 | |
| 38 #date-accessed { | |
| 39 display: none; | |
| 40 } | |
| 41 | |
| 42 :host([is-card-start]) #date-accessed { | |
| 43 @apply(--layout-center); | |
| 44 @apply(--layout-horizontal); | |
| 45 -webkit-padding-start: 20px; | |
| 46 background: #fafafa; | |
| 47 border-bottom: 1px solid rgba(0, 0, 0, 0.14); | |
| 48 border-radius: 2px 2px 0 0; | |
| 49 color: #333; | |
| 50 font-size: 14px; | |
| 51 font-weight: 500; | |
| 52 height: 48px; | |
| 53 } | |
| 54 | |
| 55 #item-container { | |
| 13 @apply(--layout-center); | 56 @apply(--layout-center); |
| 14 @apply(--layout-horizontal); | 57 @apply(--layout-horizontal); |
| 15 min-height: 40px; | 58 min-height: 40px; |
| 16 } | 59 } |
| 17 | 60 |
| 61 :host([is-card-start]) #item-container { | |
| 62 padding-top: 8px; | |
| 63 } | |
| 64 | |
| 65 :host([is-card-end]) #item-container { | |
| 66 padding-bottom: 8px; | |
| 67 } | |
| 68 | |
| 18 #titleAndDomain { | 69 #titleAndDomain { |
| 19 @apply(--layout-center); | 70 @apply(--layout-center); |
| 20 @apply(--layout-flex); | 71 @apply(--layout-flex); |
| 21 @apply(--layout-horizontal); | 72 @apply(--layout-horizontal); |
| 22 min-height: 40px; | 73 min-height: 40px; |
| 23 overflow: hidden; | 74 overflow: hidden; |
| 24 } | 75 } |
| 25 | 76 |
| 26 paper-checkbox { | 77 paper-checkbox { |
| 27 --paper-checkbox-checked-color: rgb(68, 136, 255); | 78 --paper-checkbox-checked-color: rgb(68, 136, 255); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 } | 128 } |
| 78 | 129 |
| 79 #bookmark { | 130 #bookmark { |
| 80 -webkit-margin-end: 10px; | 131 -webkit-margin-end: 10px; |
| 81 -webkit-margin-start: 20px; | 132 -webkit-margin-start: 20px; |
| 82 color: rgb(68, 136, 255); | 133 color: rgb(68, 136, 255); |
| 83 min-width: 16px; | 134 min-width: 16px; |
| 84 visibility: hidden; | 135 visibility: hidden; |
| 85 } | 136 } |
| 86 | 137 |
| 87 :host([starred]) #bookmark { | 138 #time-gap-separator { |
| 88 visibility: visible; | 139 -webkit-border-start: 1px solid #888; |
| 140 -webkit-margin-start: 77px; | |
| 141 height: 15px; | |
| 89 } | 142 } |
| 90 </style> | 143 </style> |
| 144 | |
|
calamity
2016/02/09 12:25:29
nit: stray newline.
yingran
2016/02/11 00:41:42
Done.
| |
| 91 <div id="main-container"> | 145 <div id="main-container"> |
| 92 <paper-checkbox id="checkbox" on-tap="onCheckboxSelected_" | 146 <div id="date-accessed">[[historyDate]]</div> |
| 93 checked="{{selected}}"> | 147 <div id="item-container"> |
| 94 </paper-checkbox> | 148 <paper-checkbox id="checkbox" on-tap="onCheckboxSelected_" |
| 95 <span id="time">{{timeAccessed_}}</span> | 149 checked="{{selected}}"> |
| 96 <div id="website-icon"></div> | 150 </paper-checkbox> |
| 97 <div id="titleAndDomain"> | 151 <span id="time">{{timeAccessed}}</span> |
| 98 <a href="{{websiteUrl_}}" id="title">{{websiteTitle_}}</a> | 152 <div id="website-icon"></div> |
| 99 <span id="domain">{{websiteDomain_}}</span> | 153 <div id="titleAndDomain"> |
| 154 <a href$="{{websiteUrl}}" id="title">{{websiteTitle}}</a> | |
| 155 <span id="domain">{{websiteDomain}}</span> | |
| 156 </div> | |
| 157 <iron-icon icon="star" id="bookmark"></iron-icon> | |
| 158 <paper-icon-button icon="more-vert" id="menu-button" | |
| 159 on-tap="onMenuButtonTap_"> | |
| 160 </paper-icon-button> | |
| 100 </div> | 161 </div> |
| 101 <iron-icon icon="star" id="bookmark"></iron-icon> | 162 <template is="dom-if" if="{{hasTimeGap}}"> |
| 102 <paper-icon-button icon="more-vert" id="menu-button" | 163 <div id="time-gap-separator"></div> |
| 103 on-tap="onMenuButtonTap_"> | 164 </template> |
| 104 </paper-icon-button> | |
| 105 </div> | 165 </div> |
| 106 </template> | 166 </template> |
| 107 <script src="chrome://history/history_item.js"></script> | 167 <script src="chrome://history/history_item.js"></script> |
| 108 </dom-module> | 168 </dom-module> |
| OLD | NEW |