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/iron-icon/iron-icon.htm l"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
| 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/iron-icons/iron-icons.h tml"> |
| 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-button/paper-butt on.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-checkbox/paper-ch eckbox.html"> |
| 7 <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"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> |
| 9 <link rel="import" href="chrome://resources/html/util.html"> | 9 <link rel="import" href="chrome://resources/html/util.html"> |
| 10 | 10 |
| 11 <link rel="import" href="chrome://history/shared_style.html"> | |
|
tsergeant
2016/02/23 04:52:26
Nit: Move the blank line from before this line to
calamity
2016/02/23 05:33:43
Done.
| |
| 11 <dom-module id="history-item"> | 12 <dom-module id="history-item"> |
| 12 <template> | 13 <template> |
| 14 <style include="shared-style"></style> | |
| 13 <style> | 15 <style> |
| 14 :host { | 16 :host { |
| 15 @apply(--layout-center); | 17 @apply(--layout-center); |
| 16 @apply(--layout-vertical); | 18 @apply(--layout-vertical); |
| 17 padding: 0 24px; | 19 padding: 0 24px; |
| 18 } | 20 } |
| 19 | 21 |
| 20 #main-container { | 22 #main-container { |
| 21 background: #fff; | 23 background: #fff; |
| 22 border-color: rgba(0, 0, 0, 0.14); | 24 border-color: var(--card-border-color); |
| 23 border-style: solid; | 25 border-style: solid; |
| 24 border-width: 0 1px; | 26 border-width: 0 1px; |
| 25 max-width: 960px; | 27 max-width: var(--card-max-width); |
| 26 min-width: 500px; | 28 min-width: var(--card-min-width); |
| 27 width: 100%; | 29 width: 100%; |
| 28 } | 30 } |
| 29 | 31 |
| 30 :host([is-card-start]) #main-container { | 32 :host([is-card-start]) #main-container { |
| 31 border-top-width: 1px; | 33 border-top-width: 1px; |
| 32 margin-top: 20px; | 34 margin-top: 20px; |
| 33 } | 35 } |
| 34 | 36 |
| 35 :host([is-card-end]) #main-container { | 37 :host([is-card-end]) #main-container { |
| 36 border-bottom-width: 2px; | 38 border-bottom-width: 2px; |
| 37 } | 39 } |
| 38 | 40 |
| 39 #date-accessed { | 41 #date-accessed { |
| 40 display: none; | 42 display: none; |
| 41 } | 43 } |
| 42 | 44 |
| 43 :host([is-card-start]) #date-accessed { | 45 :host([is-card-start]) #date-accessed { |
| 44 @apply(--layout-center); | 46 display: flex; |
| 45 @apply(--layout-horizontal); | |
| 46 -webkit-padding-start: 20px; | |
| 47 background: #fafafa; | |
| 48 border-bottom: 1px solid rgba(0, 0, 0, 0.14); | |
| 49 border-radius: 2px 2px 0 0; | |
| 50 color: #333; | |
| 51 font-size: 14px; | |
| 52 font-weight: 500; | |
| 53 height: 48px; | |
| 54 } | 47 } |
| 55 | 48 |
| 56 #item-container { | 49 #item-container { |
| 57 @apply(--layout-center); | 50 @apply(--layout-center); |
| 58 @apply(--layout-horizontal); | 51 @apply(--layout-horizontal); |
| 59 min-height: 40px; | 52 min-height: 40px; |
| 60 } | 53 } |
| 61 | 54 |
| 62 :host([is-card-start]) #item-container { | 55 :host([is-card-start]) #item-container { |
| 63 padding-top: 8px; | 56 padding-top: 8px; |
| 64 } | 57 } |
| 65 | 58 |
| 66 :host([is-card-end]) #item-container { | 59 :host([is-card-end]) #item-container { |
| 67 padding-bottom: 8px; | 60 padding-bottom: 8px; |
| 68 } | 61 } |
| 69 | 62 |
| 70 #titleAndDomain { | 63 #title-and-domain { |
| 71 @apply(--layout-center); | 64 @apply(--layout-center); |
| 72 @apply(--layout-flex); | 65 @apply(--layout-flex); |
| 73 @apply(--layout-horizontal); | 66 @apply(--layout-horizontal); |
| 74 min-height: 40px; | 67 min-height: 40px; |
| 75 overflow: hidden; | 68 overflow: hidden; |
| 76 } | 69 } |
| 77 | 70 |
| 78 paper-checkbox { | 71 paper-checkbox { |
| 79 --paper-checkbox-checked-color: rgb(68, 136, 255); | 72 --paper-checkbox-checked-color: rgb(68, 136, 255); |
| 80 --paper-checkbox-size: 16px; | 73 --paper-checkbox-size: 16px; |
| 81 --paper-checkbox-unchecked-color: #969696; | 74 --paper-checkbox-unchecked-color: #969696; |
| 82 height: 16px; | 75 height: 16px; |
| 83 margin: 0 16px 0 20px; | 76 margin: 0 16px 0 20px; |
| 84 padding: 2px; | 77 padding: 2px; |
| 85 width: 16px; | 78 width: 16px; |
| 86 } | 79 } |
| 87 | 80 |
| 88 #time { | 81 #time-accessed { |
| 89 color: #646464; | 82 color: #646464; |
| 90 min-width: 96px; | 83 min-width: 96px; |
| 91 } | 84 } |
| 92 | 85 |
| 93 #title { | |
| 94 color: #333; | |
| 95 overflow: hidden; | |
| 96 text-decoration: none; | |
| 97 text-overflow: ellipsis; | |
| 98 white-space: nowrap; | |
| 99 } | |
| 100 | |
| 101 #title:hover { | |
| 102 text-decoration: underline; | |
| 103 } | |
| 104 | |
| 105 #domain { | 86 #domain { |
| 106 -webkit-margin-start: 16px; | 87 -webkit-margin-start: 16px; |
| 107 color: #969696; | 88 color: #969696; |
| 108 flex-shrink: 0; | 89 flex-shrink: 0; |
| 109 } | 90 } |
| 110 | 91 |
| 111 iron-icon { | |
| 112 --iron-icon-height: 16px; | |
| 113 --iron-icon-width: 16px; | |
| 114 } | |
| 115 | |
| 116 #website-icon { | |
| 117 -webkit-margin-end: 16px; | |
| 118 height: 16px; | |
| 119 min-width: 16px; | |
| 120 } | |
| 121 | |
| 122 #menu-button { | 92 #menu-button { |
| 123 -webkit-margin-end: 12px; | 93 -webkit-margin-end: 12px; |
| 124 -webkit-margin-start: 2px; | 94 -webkit-margin-start: 2px; |
| 125 color: #969696; | 95 color: #969696; |
| 126 height: 36px; | 96 height: 36px; |
| 127 min-width: 36px; | 97 min-width: 36px; |
| 128 width: 36px; | 98 width: 36px; |
| 129 } | 99 } |
| 130 | 100 |
| 131 #bookmark { | 101 #bookmark-star { |
| 102 --iron-icon-height: 16px; | |
| 103 --iron-icon-width: 16px; | |
| 132 -webkit-margin-end: 10px; | 104 -webkit-margin-end: 10px; |
| 133 -webkit-margin-start: 20px; | 105 -webkit-margin-start: 20px; |
| 134 color: rgb(68, 136, 255); | 106 color: rgb(68, 136, 255); |
| 135 min-width: 16px; | 107 min-width: 16px; |
| 136 visibility: hidden; | 108 visibility: hidden; |
| 137 } | 109 } |
| 138 | 110 |
| 139 #time-gap-separator { | 111 #time-gap-separator { |
| 140 -webkit-border-start: 1px solid #888; | 112 -webkit-border-start: 1px solid #888; |
| 141 -webkit-margin-start: 77px; | 113 -webkit-margin-start: 77px; |
| 142 height: 15px; | 114 height: 15px; |
| 143 } | 115 } |
| 144 </style> | 116 </style> |
| 145 <div id="main-container"> | 117 <div id="main-container"> |
| 146 <div id="date-accessed">[[historyDate]]</div> | 118 <div id="date-accessed" class="card-title">[[historyDate]]</div> |
| 147 <div id="item-container"> | 119 <div id="item-container"> |
| 148 <paper-checkbox id="checkbox" on-tap="onCheckboxSelected_" | 120 <paper-checkbox id="checkbox" on-tap="onCheckboxSelected_" |
| 149 checked="{{selected}}" disabled="[[selectionNotAllowed_()]]"> | 121 checked="{{selected}}" disabled="[[selectionNotAllowed_()]]"> |
| 150 </paper-checkbox> | 122 </paper-checkbox> |
| 151 <span id="time">{{timeAccessed}}</span> | 123 <span id="time-accessed">{{timeAccessed}}</span> |
| 152 <div id="website-icon"></div> | 124 <div class="website-icon" id="icon"></div> |
| 153 <div id="titleAndDomain"> | 125 <div id="title-and-domain"> |
| 154 <a href$="{{websiteUrl}}" id="title">{{websiteTitle}}</a> | 126 <a href$="{{websiteUrl}}" id="title" class="website-title"> |
| 127 {{websiteTitle}} | |
| 128 </a> | |
| 155 <span id="domain">{{websiteDomain}}</span> | 129 <span id="domain">{{websiteDomain}}</span> |
| 156 </div> | 130 </div> |
| 157 <iron-icon icon="star" id="bookmark"></iron-icon> | 131 <iron-icon icon="star" id="bookmark-star"></iron-icon> |
| 158 <paper-icon-button icon="more-vert" id="menu-button" | 132 <paper-icon-button icon="more-vert" id="menu-button" |
| 159 on-tap="onMenuButtonTap_"> | 133 on-tap="onMenuButtonTap_"> |
| 160 </paper-icon-button> | 134 </paper-icon-button> |
| 161 </div> | 135 </div> |
| 162 <template is="dom-if" if="{{hasTimeGap}}"> | 136 <template is="dom-if" if="{{hasTimeGap}}"> |
| 163 <div id="time-gap-separator"></div> | 137 <div id="time-gap-separator"></div> |
| 164 </template> | 138 </template> |
| 165 </div> | 139 </div> |
| 166 </template> | 140 </template> |
| 167 <script src="chrome://history/history_item.js"></script> | 141 <script src="chrome://history/history_item.js"></script> |
| 168 </dom-module> | 142 </dom-module> |
| OLD | NEW |