Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> |
| 4 <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-icon/iron-icon.htm l"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.htm l"> |
| 7 <link rel="import" href="chrome://resources/html/icon.html"> | 7 <link rel="import" href="chrome://resources/html/icon.html"> |
| 8 <link rel="import" href="chrome://history/browser_service.html"> | 8 <link rel="import" href="chrome://history/browser_service.html"> |
| 9 <link rel="import" href="chrome://history/constants.html"> | 9 <link rel="import" href="chrome://history/constants.html"> |
| 10 <link rel="import" href="chrome://history/searched_label.html"> | 10 <link rel="import" href="chrome://history/searched_label.html"> |
| 11 <link rel="import" href="chrome://history/shared_style.html"> | 11 <link rel="import" href="chrome://history/shared_style.html"> |
| 12 | 12 |
| 13 <dom-module id="history-synced-device-card"> | 13 <dom-module id="history-synced-device-card"> |
| 14 <template> | 14 <template> |
| 15 <style include="shared-style"> | 15 <style include="shared-style"> |
| 16 :host { | 16 :host { |
| 17 @apply(--card-sizing); | 17 @apply(--card-sizing); |
| 18 display: block; | 18 display: block; |
| 19 padding-bottom: var(--card-padding-between); | 19 padding-bottom: var(--card-padding-between); |
| 20 } | 20 } |
| 21 | 21 |
| 22 #card-heading { | 22 #card-heading { |
|
tsergeant
2016/09/13 05:57:17
There's still extra padding on the right side of t
lshang
2016/09/13 23:50:28
Oh I thought extra padding on the right of the but
| |
| 23 cursor: pointer; | 23 cursor: pointer; |
| 24 justify-content: space-between; | 24 justify-content: space-between; |
| 25 } | 25 } |
| 26 | 26 |
| 27 #tab-item-list { | 27 #tab-item-list { |
| 28 padding: 8px 0; | 28 padding: 8px 0; |
| 29 } | 29 } |
| 30 | 30 |
| 31 #title-text { | |
| 32 overflow: hidden; | |
| 33 padding-right: 3px; | |
| 34 text-overflow: ellipsis; | |
| 35 } | |
| 36 | |
| 31 #last-update-time { | 37 #last-update-time { |
| 32 color: var(--secondary-text-color); | 38 color: var(--secondary-text-color); |
| 33 } | 39 } |
| 34 | 40 |
| 41 #left-content { | |
|
tsergeant
2016/09/13 05:57:17
Nit: It might be good to name this something more
lshang
2016/09/13 23:50:28
Done.
| |
| 42 display: flex; | |
| 43 overflow: hidden; | |
| 44 } | |
| 45 | |
| 35 #right-buttons { | 46 #right-buttons { |
| 36 -webkit-margin-end: 4px; | 47 -webkit-margin-end: 4px; |
| 37 } | 48 } |
| 38 | 49 |
| 39 #menu-button { | 50 #menu-button { |
| 40 -webkit-margin-end: 8px; | 51 -webkit-margin-end: 8px; |
| 41 } | 52 } |
| 42 | 53 |
| 43 #collapse { | 54 #collapse { |
| 44 overflow: hidden; | 55 overflow: hidden; |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 60 #window-separator { | 71 #window-separator { |
| 61 background-color: var(--card-border-color); | 72 background-color: var(--card-border-color); |
| 62 height: 1px; | 73 height: 1px; |
| 63 margin: 5px auto; | 74 margin: 5px auto; |
| 64 width: 80%; | 75 width: 80%; |
| 65 } | 76 } |
| 66 </style> | 77 </style> |
| 67 <div id="history-item-container"> | 78 <div id="history-item-container"> |
| 68 <div class="card-title" id="card-heading" aria-expanded$="[[opened]]" | 79 <div class="card-title" id="card-heading" aria-expanded$="[[opened]]" |
| 69 aria-controls="collapse" on-tap="toggleTabCard"> | 80 aria-controls="collapse" on-tap="toggleTabCard"> |
| 70 <div> | 81 <div id="left-content"> |
| 71 [[device]] | 82 <div id="title-text"> |
| 83 [[device]] | |
| 84 </div> | |
|
lshang
2016/09/13 05:08:45
I moved "last-update-time" out of "title-text" so
| |
| 72 <span id="last-update-time">[[lastUpdateTime]]</span> | 85 <span id="last-update-time">[[lastUpdateTime]]</span> |
| 73 </div> | 86 </div> |
| 74 <div id="right-buttons"> | 87 <div id="right-buttons"> |
| 75 <button is="paper-icon-button-light" id="menu-button" | 88 <button is="paper-icon-button-light" id="menu-button" |
| 76 class="more-vert-button" on-tap="onMenuButtonTap_" | 89 class="more-vert-button" on-tap="onMenuButtonTap_" |
| 77 title="$i18n{moreActionsButton}"> | 90 title="$i18n{moreActionsButton}"> |
| 78 <div></div> | 91 <div></div> |
| 79 <div></div> | 92 <div></div> |
| 80 <div></div> | 93 <div></div> |
| 81 </button> | 94 </button> |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 102 <div id="window-separator" | 115 <div id="window-separator" |
| 103 hidden$="[[!isWindowSeparatorIndex_(index, separatorIndexes)]]"> | 116 hidden$="[[!isWindowSeparatorIndex_(index, separatorIndexes)]]"> |
| 104 </div> | 117 </div> |
| 105 </template> | 118 </template> |
| 106 </div> | 119 </div> |
| 107 </iron-collapse> | 120 </iron-collapse> |
| 108 </div> | 121 </div> |
| 109 </template> | 122 </template> |
| 110 <script src="chrome://history/synced_device_card.js"></script> | 123 <script src="chrome://history/synced_device_card.js"></script> |
| 111 </dom-module> | 124 </dom-module> |
| OLD | NEW |