Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a pp-drawer.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a pp-drawer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> |
| 4 <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-item/paper-item.h tml"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-s hared-styles.html"> | |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-lis tbox.html"> | |
|
tsergeant
2016/07/13 07:23:33
Listbox is unused, paper-item-shared-styles might
calamity
2016/07/14 06:20:57
paper-item-shared-styles are used for --paper-font
| |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> |
| 6 <link rel="import" href="chrome://history/shared_style.html"> | 9 <link rel="import" href="chrome://history/shared_style.html"> |
| 7 | 10 |
| 8 <dom-module id="history-side-bar"> | 11 <dom-module id="history-side-bar"> |
| 9 <template> | 12 <template> |
| 10 <style include="shared-style"> | 13 <style include="shared-style"> |
| 11 :host { | 14 :host { |
| 12 display: block; | 15 display: block; |
| 13 padding-top: 5px; | 16 padding-top: 5px; |
| 14 width: var(--side-bar-width); | 17 width: var(--side-bar-width); |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 32 div.separator { | 35 div.separator { |
| 33 background-color: rgba(0, 0, 0, 0.08); | 36 background-color: rgba(0, 0, 0, 0.08); |
| 34 height: 1px; | 37 height: 1px; |
| 35 margin: 8px 0; | 38 margin: 8px 0; |
| 36 } | 39 } |
| 37 | 40 |
| 38 #clear-browsing-data { | 41 #clear-browsing-data { |
| 39 text-transform: uppercase; | 42 text-transform: uppercase; |
| 40 } | 43 } |
| 41 | 44 |
| 42 paper-item { | 45 iron-selector { |
| 46 -webkit-user-select: none; | |
| 47 background-color: transparent; | |
| 48 color: #5a5a5a; | |
| 49 } | |
| 50 | |
| 51 iron-selector a { | |
|
tsergeant
2016/07/13 07:23:33
Replacing paper-item with this CSS removes the foc
calamity
2016/07/14 06:20:57
Fixed.
| |
| 52 @apply(--paper-font-subhead); | |
| 43 -webkit-padding-start: 25px; | 53 -webkit-padding-start: 25px; |
| 54 align-items: center; | |
| 55 box-sizing: border-box; | |
| 56 color: inherit; | |
| 44 cursor: pointer; | 57 cursor: pointer; |
| 58 display: flex; | |
| 45 font-size: 14px; | 59 font-size: 14px; |
| 46 font-weight: 500; | 60 font-weight: 500; |
| 61 min-height: 48px; | |
| 62 outline: none; | |
| 63 position: relative; | |
| 64 text-decoration: none; | |
| 47 } | 65 } |
| 48 | 66 |
| 49 paper-item.iron-selected { | 67 iron-selector a.iron-selected { |
| 50 color: var(--google-blue-500); | 68 color: var(--google-blue-500); |
| 51 font-weight: 500; | 69 font-weight: 500; |
| 52 } | 70 } |
| 53 | 71 |
| 54 iron-selector { | 72 iron-selector { |
| 55 -webkit-user-select: none; | 73 -webkit-user-select: none; |
| 56 color: #5a5a5a; | 74 color: #5a5a5a; |
| 57 } | 75 } |
| 58 </style> | 76 </style> |
| 59 | 77 |
| 60 <app-drawer id="drawer" tabindex="0" on-focus="onDrawerFocus_" swipe-open | 78 <app-drawer id="drawer" tabindex="0" on-focus="onDrawerFocus_" swipe-open |
| 61 align="start"> | 79 align="start"> |
| 62 <div id="drawer-header"> | 80 <div id="drawer-header"> |
| 63 <h1>$i18n{title}</h1> | 81 <h1>$i18n{title}</h1> |
| 64 </div> | 82 </div> |
| 65 <iron-selector id="menu" selected="{{selectedPage}}" | 83 <iron-selector id="menu" selected="{{selectedPage}}" |
| 66 selectable=".page-item" attr-for-selected="view-id" | 84 selectable=".page-item" attr-for-selected="path" |
| 85 fallback-selection="history" | |
| 67 on-iron-activate="onSelectorActivate_"> | 86 on-iron-activate="onSelectorActivate_"> |
| 68 <paper-item view-id="history" class="page-item"> | 87 <a href="/" class="page-item" path="history"> |
| 69 $i18n{historyMenuItem} | 88 <div>$i18n{historyMenuItem}</div> |
| 70 </paper-item> | 89 <paper-ripple></paper-ripple> |
|
tsergeant
2016/07/13 07:23:33
The ripples were intentionally deleted from the si
calamity
2016/07/14 06:20:57
Done.
| |
| 71 <paper-item view-id="synced-devices" class="page-item"> | 90 </a> |
| 72 $i18n{openTabsMenuItem} | 91 <a href="/syncedTabs" class="page-item" path="syncedTabs"> |
| 73 </paper-item> | 92 <div>$i18n{openTabsMenuItem}</div> |
| 93 <paper-ripple></paper-ripple> | |
| 94 </a> | |
| 74 <div class="separator"></div> | 95 <div class="separator"></div> |
| 75 <paper-item on-tap="onClearBrowsingDataTap_" id="clear-browsing-data"> | 96 <a href="chrome://settings/clearBrowserData" id="clear-browsing-data"> |
|
tsergeant
2016/07/13 07:23:33
I changed this button to use a chrome.send call, r
calamity
2016/07/14 06:20:57
Done.
| |
| 76 $i18n{clearBrowsingData} | 97 <div>$i18n{clearBrowsingData}</div> |
| 77 </paper-item> | 98 <paper-ripple></paper-ripple> |
| 99 </a> | |
| 78 </iron-selector> | 100 </iron-selector> |
| 79 </app-drawer> | 101 </app-drawer> |
| 80 </template> | 102 </template> |
| 81 <script src="chrome://history/side_bar.js"></script> | 103 <script src="chrome://history/side_bar.js"></script> |
| 82 </dom-module> | 104 </dom-module> |
| OLD | NEW |