Index: chrome/browser/resources/md_history/side_bar.html |
diff --git a/chrome/browser/resources/md_history/side_bar.html b/chrome/browser/resources/md_history/side_bar.html |
index 9468875d34d5b24a0c9c24e9c3ad5919d1b82a80..820d8baf17409ea1066e75fea0d69341aac7adad 100644 |
--- a/chrome/browser/resources/md_history/side_bar.html |
+++ b/chrome/browser/resources/md_history/side_bar.html |
@@ -2,6 +2,9 @@ |
<link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/app-drawer.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-selector.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-shared-styles.html"> |
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-listbox.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
|
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripple.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> |
<link rel="import" href="chrome://history/shared_style.html"> |
@@ -39,14 +42,29 @@ |
text-transform: uppercase; |
} |
- paper-item { |
+ iron-selector { |
+ -webkit-user-select: none; |
+ background-color: transparent; |
+ color: #5a5a5a; |
+ } |
+ |
+ 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.
|
+ @apply(--paper-font-subhead); |
-webkit-padding-start: 25px; |
+ align-items: center; |
+ box-sizing: border-box; |
+ color: inherit; |
cursor: pointer; |
+ display: flex; |
font-size: 14px; |
font-weight: 500; |
+ min-height: 48px; |
+ outline: none; |
+ position: relative; |
+ text-decoration: none; |
} |
- paper-item.iron-selected { |
+ iron-selector a.iron-selected { |
color: var(--google-blue-500); |
font-weight: 500; |
} |
@@ -63,18 +81,22 @@ |
<h1>$i18n{title}</h1> |
</div> |
<iron-selector id="menu" selected="{{selectedPage}}" |
- selectable=".page-item" attr-for-selected="view-id" |
+ selectable=".page-item" attr-for-selected="path" |
+ fallback-selection="history" |
on-iron-activate="onSelectorActivate_"> |
- <paper-item view-id="history" class="page-item"> |
- $i18n{historyMenuItem} |
- </paper-item> |
- <paper-item view-id="synced-devices" class="page-item"> |
- $i18n{openTabsMenuItem} |
- </paper-item> |
+ <a href="/" class="page-item" path="history"> |
+ <div>$i18n{historyMenuItem}</div> |
+ <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.
|
+ </a> |
+ <a href="/syncedTabs" class="page-item" path="syncedTabs"> |
+ <div>$i18n{openTabsMenuItem}</div> |
+ <paper-ripple></paper-ripple> |
+ </a> |
<div class="separator"></div> |
- <paper-item on-tap="onClearBrowsingDataTap_" id="clear-browsing-data"> |
- $i18n{clearBrowsingData} |
- </paper-item> |
+ <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.
|
+ <div>$i18n{clearBrowsingData}</div> |
+ <paper-ripple></paper-ripple> |
+ </a> |
</iron-selector> |
</app-drawer> |
</template> |