| 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/iron-a11y-keys-behavior
/iron-a11y-keys-behavior.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior
/iron-a11y-keys-behavior.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-ripple/paper-ripp
le.html"> | 4 <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
"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/typography
.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/typography
.html"> |
| 7 <link rel="import" href="chrome://history/browser_service.html"> | 7 <link rel="import" href="chrome://history/browser_service.html"> |
| 8 <link rel="import" href="chrome://history/shared_style.html"> | 8 <link rel="import" href="chrome://history/shared_style.html"> |
| 9 | 9 |
| 10 <dom-module id="history-side-bar"> | 10 <dom-module id="history-side-bar"> |
| 11 <template> | 11 <template> |
| 12 <style include="shared-style"> | 12 <style include="shared-style"> |
| 13 :host { | 13 :host { |
| 14 display: flex; | 14 display: flex; |
| 15 height: 100%; | 15 height: 100%; |
| 16 overflow-x: hidden; | 16 overflow-x: hidden; |
| 17 overflow-y: auto; | 17 overflow-y: auto; |
| 18 width: var(--side-bar-width); | 18 width: var(--side-bar-width); |
| 19 } | 19 } |
| 20 | 20 |
| 21 :host([drawer]) { | 21 :host([drawer]) { |
| 22 height: calc(100% - var(--toolbar-height)); | 22 height: calc(100% - var(--toolbar-height)); |
| 23 } | 23 } |
| 24 | 24 |
| 25 div.separator { | 25 div.separator { |
| 26 background-color: rgba(0, 0, 0, 0.08); | 26 background-color: var(--separator-color); |
| 27 flex-shrink: 0; | 27 flex-shrink: 0; |
| 28 height: 1px; | 28 height: 1px; |
| 29 margin: 8px 0; | 29 margin: 8px 0; |
| 30 } | 30 } |
| 31 | 31 |
| 32 #clear-browsing-data { | 32 #clear-browsing-data { |
| 33 justify-content: space-between; | 33 justify-content: space-between; |
| 34 } | 34 } |
| 35 | 35 |
| 36 #clear-browsing-data iron-icon { | 36 #clear-browsing-data iron-icon { |
| 37 -webkit-margin-end: 20px; | 37 -webkit-margin-end: 20px; |
| 38 color: var(--paper-grey-400); | 38 color: var(--paper-grey-400); |
| 39 height: 20px; | 39 height: 20px; |
| 40 margin-bottom: 10px; | 40 margin-bottom: 10px; |
| 41 margin-top: 10px; | 41 margin-top: 10px; |
| 42 width: 20px; | 42 width: 20px; |
| 43 } | 43 } |
| 44 | 44 |
| 45 iron-selector { | 45 iron-selector { |
| 46 -webkit-user-select: none; | 46 -webkit-user-select: none; |
| 47 background-color: transparent; | 47 background-color: transparent; |
| 48 color: #5a5a5a; | 48 color: var(--sidebar-unselected-color); |
| 49 display: flex; | 49 display: flex; |
| 50 flex: 1; | 50 flex: 1; |
| 51 flex-direction: column; | 51 flex-direction: column; |
| 52 padding-top: 8px; | 52 padding-top: 8px; |
| 53 } | 53 } |
| 54 | 54 |
| 55 iron-selector > a { | 55 iron-selector > a { |
| 56 @apply(--paper-font-subhead); | 56 @apply(--paper-font-subhead); |
| 57 /* Ensure the focus outline appears correctly (crbug.com/655503). */ | 57 /* Ensure the focus outline appears correctly (crbug.com/655503). */ |
| 58 -webkit-margin-end: 4px; | 58 -webkit-margin-end: 4px; |
| 59 -webkit-padding-start: 24px; | 59 -webkit-padding-start: 24px; |
| 60 align-items: center; | 60 align-items: center; |
| 61 box-sizing: border-box; | 61 box-sizing: border-box; |
| 62 color: inherit; | 62 color: inherit; |
| 63 cursor: pointer; | 63 cursor: pointer; |
| 64 display: flex; | 64 display: flex; |
| 65 font-size: 14px; | 65 font-size: 14px; |
| 66 font-weight: 500; | 66 font-weight: 500; |
| 67 min-height: 48px; | 67 min-height: 48px; |
| 68 position: relative; | 68 position: relative; |
| 69 text-decoration: none; | 69 text-decoration: none; |
| 70 } | 70 } |
| 71 | 71 |
| 72 iron-selector > a.iron-selected { | 72 iron-selector > a.iron-selected { |
| 73 color: var(--google-blue-500); | 73 color: var(--link-color); |
| 74 } | 74 } |
| 75 | 75 |
| 76 #spacer { | 76 #spacer { |
| 77 flex: 1; | 77 flex: 1; |
| 78 } | 78 } |
| 79 | 79 |
| 80 #footer { | 80 #footer { |
| 81 color: var(--paper-grey-600); | 81 color: var(--sidebar-footer-text-color); |
| 82 width: var(--side-bar-width); | 82 width: var(--side-bar-width); |
| 83 } | 83 } |
| 84 | 84 |
| 85 #footer-text { | 85 #footer-text { |
| 86 -webkit-padding-end: 16px; | 86 -webkit-padding-end: 16px; |
| 87 -webkit-padding-start: 24px; | 87 -webkit-padding-start: 24px; |
| 88 line-height: 20px; | 88 line-height: 20px; |
| 89 margin: 24px 0; | 89 margin: 24px 0; |
| 90 } | 90 } |
| 91 | 91 |
| 92 #footer a { | 92 #footer a { |
| 93 color: var(--google-blue-700); | |
| 94 text-decoration: none; | 93 text-decoration: none; |
| 95 } | 94 } |
| 96 </style> | 95 </style> |
| 97 | 96 |
| 98 <iron-selector id="menu" selected="{{selectedPage}}" | 97 <iron-selector id="menu" selected="{{selectedPage}}" |
| 99 selectable=".page-item" attr-for-selected="path" | 98 selectable=".page-item" attr-for-selected="path" |
| 100 fallback-selection="history" | 99 fallback-selection="history" |
| 101 on-iron-activate="onSelectorActivate_"> | 100 on-iron-activate="onSelectorActivate_"> |
| 102 <a href="/" class="page-item" path="history" on-click="onItemClick_"> | 101 <a href="/" class="page-item" path="history" on-click="onItemClick_"> |
| 103 $i18n{historyMenuItem} | 102 $i18n{historyMenuItem} |
| (...skipping 13 matching lines...) Expand all Loading... |
| 117 </a> | 116 </a> |
| 118 <div id="spacer"></div> | 117 <div id="spacer"></div> |
| 119 <div id="footer" hidden="[[!showFooter]]"> | 118 <div id="footer" hidden="[[!showFooter]]"> |
| 120 <div class="separator"></div> | 119 <div class="separator"></div> |
| 121 <div id="footer-text">$i18nRaw{sidebarFooter}</div> | 120 <div id="footer-text">$i18nRaw{sidebarFooter}</div> |
| 122 </div> | 121 </div> |
| 123 </iron-selector> | 122 </iron-selector> |
| 124 </template> | 123 </template> |
| 125 <script src="chrome://history/side_bar.js"></script> | 124 <script src="chrome://history/side_bar.js"></script> |
| 126 </dom-module> | 125 </dom-module> |
| OLD | NEW |