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="about_page_browser_proxy.html"> | 2 <link rel="import" href="about_page_browser_proxy.html"> |
| 3 <link rel="import" href="../i18n_setup.html"> | 3 <link rel="import" href="../i18n_setup.html"> |
| 4 <link rel="import" href="../icons.html"> | 4 <link rel="import" href="../icons.html"> |
| 5 <link rel="import" href="../lifetime_browser_proxy.html"> | 5 <link rel="import" href="../lifetime_browser_proxy.html"> |
| 6 <link rel="import" href="../route.html"> | 6 <link rel="import" href="../route.html"> |
| 7 <link rel="import" href="../settings_page/main_page_behavior.html"> | 7 <link rel="import" href="../settings_page/main_page_behavior.html"> |
| 8 <link rel="import" href="../settings_page/settings_animated_pages.html"> | 8 <link rel="import" href="../settings_page/settings_animated_pages.html"> |
| 9 <link rel="import" href="../settings_page/settings_section.html"> | 9 <link rel="import" href="../settings_page/settings_section.html"> |
| 10 <link rel="import" href="../settings_page_css.html"> | 10 <link rel="import" href="../settings_page_css.html"> |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 26 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 27 </if> | 27 </if> |
| 28 | 28 |
| 29 <dom-module id="settings-about-page"> | 29 <dom-module id="settings-about-page"> |
| 30 <template> | 30 <template> |
| 31 <style include="settings-shared settings-page-styles"> | 31 <style include="settings-shared settings-page-styles"> |
| 32 :host { | 32 :host { |
| 33 --about-page-image-space: 10px; | 33 --about-page-image-space: 10px; |
| 34 } | 34 } |
| 35 | 35 |
| 36 .block { | |
|
dpapad
2017/02/17 21:51:17
This rule does not have any effect, can we remove
stevenjb
2017/02/18 19:46:17
Huh, I didn't realize we had that, thanks. Done.
| |
| 37 display: block; | |
| 38 } | |
| 39 | |
| 36 .copyable { | 40 .copyable { |
| 37 -webkit-user-select: text; | 41 -webkit-user-select: text; |
| 38 } | 42 } |
| 39 | 43 |
| 44 .info-section { | |
| 45 margin-bottom: 12px; | |
| 46 } | |
| 47 | |
| 48 .padded { | |
| 49 padding-bottom: 10px; | |
| 50 padding-top: 10px; | |
| 51 } | |
| 52 | |
| 40 .product-title { | 53 .product-title { |
| 41 font-size: 153.85%; /* 20px / 13px */ | 54 font-size: 153.85%; /* 20px / 13px */ |
| 42 margin-bottom: auto; | 55 margin-bottom: auto; |
| 43 margin-top: auto; | 56 margin-top: auto; |
| 44 } | 57 } |
| 45 | 58 |
| 46 img { | 59 img { |
| 47 -webkit-margin-end: var(--about-page-image-space); | 60 -webkit-margin-end: var(--about-page-image-space); |
| 48 } | 61 } |
| 49 | 62 |
| 50 iron-icon { | 63 iron-icon { |
| 51 -webkit-margin-end: var(--about-page-image-space); | 64 -webkit-margin-end: var(--about-page-image-space); |
| 52 width: 32px; /* The width of the product-logo img. */ | 65 width: 32px; /* The width of the product-logo img. */ |
| 53 } | 66 } |
| 54 | 67 |
| 55 iron-icon[icon='settings:check-circle'] { | 68 iron-icon[icon='settings:check-circle'] { |
| 56 fill: var(--paper-blue-600); | 69 fill: var(--paper-blue-600); |
| 57 } | 70 } |
| 58 | 71 |
| 59 iron-icon[icon='settings:error'] { | 72 iron-icon[icon='settings:error'] { |
| 60 fill: var(--paper-red-600); | 73 fill: var(--paper-red-600); |
| 61 } | 74 } |
| 62 | 75 |
| 63 .product-info { | |
| 64 display: block; | |
| 65 padding-bottom: 10px; | |
| 66 padding-top: 10px; | |
| 67 } | |
| 68 | |
| 69 .info-section { | |
| 70 margin-bottom: 12px; | |
| 71 } | |
| 72 | |
| 73 #regulatoryInfo img { | 76 #regulatoryInfo img { |
| 74 width: 330px; | 77 width: 330px; |
| 75 } | 78 } |
| 76 | 79 |
| 77 <if expr="_google_chrome and is_macosx"> | 80 <if expr="_google_chrome and is_macosx"> |
| 78 #promoteUpdater[disabled] { | 81 #promoteUpdater[disabled] { |
| 79 @apply(--settings-secondary); | 82 @apply(--settings-secondary); |
| 80 } | 83 } |
| 81 </if> | 84 </if> |
| 82 </style> | 85 </style> |
| 83 <div> | 86 <div> |
| 84 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> | 87 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> |
| 85 <settings-animated-pages id="pages" section="about"> | 88 <settings-animated-pages id="pages" section="about"> |
| 86 <neon-animatable route-path="default"> | 89 <neon-animatable route-path="default"> |
| 87 <div class="settings-box two-line"> | 90 <div class="settings-box two-line"> |
| 88 <img id="product-logo" on-tap="onProductLogoTap_" | 91 <img id="product-logo" on-tap="onProductLogoTap_" |
| 89 srcset="chrome://theme/current-channel-logo@1x 1x, | 92 srcset="chrome://theme/current-channel-logo@1x 1x, |
| 90 chrome://theme/current-channel-logo@2x 2x" alt=""> | 93 chrome://theme/current-channel-logo@2x 2x" alt=""> |
| 91 <span class="product-title">$i18n{aboutProductTitle}</span> | 94 <span class="product-title">$i18n{aboutProductTitle}</span> |
| 92 </div> | 95 </div> |
| 93 <div class="settings-box two-line"> | 96 <div class="settings-box two-line"> |
| 94 <iron-icon | 97 <iron-icon |
| 95 hidden="[[!showUpdateStatus_]]" | 98 hidden="[[!showUpdateStatus_]]" |
| 96 icon$="[[getIcon_( | 99 icon$="[[getIcon_( |
| 97 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]" | 100 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]" |
| 98 src="[[getIconSrc_( | 101 src="[[getIconSrc_( |
| 99 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"> | 102 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"> |
| 100 </iron-icon> | 103 </iron-icon> |
| 101 <div class="start"> | 104 <div class="start padded"> |
| 102 <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]" | 105 <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]" |
| 103 <if expr="not chromeos"> | 106 <if expr="not chromeos"> |
| 104 inner-h-t-m-l="[[getUpdateStatusMessage_( | 107 inner-h-t-m-l="[[getUpdateStatusMessage_( |
| 105 currentUpdateStatusEvent_)]]"> | 108 currentUpdateStatusEvent_)]]"> |
| 106 </if> | 109 </if> |
| 107 <if expr="chromeos"> | 110 <if expr="chromeos"> |
| 108 inner-h-t-m-l="[[getUpdateStatusMessage_( | 111 inner-h-t-m-l="[[getUpdateStatusMessage_( |
| 109 currentUpdateStatusEvent_, targetChannel_)]]"> | 112 currentUpdateStatusEvent_, targetChannel_)]]"> |
| 110 </if> | 113 </if> |
| 111 </div> | 114 </div> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 175 </if> | 178 </if> |
| 176 <if expr="chromeos"> | 179 <if expr="chromeos"> |
| 177 <div class="settings-box" on-tap="onDetailedBuildInfoTap_" | 180 <div class="settings-box" on-tap="onDetailedBuildInfoTap_" |
| 178 actionable> | 181 actionable> |
| 179 <div class="start">$i18n{aboutDetailedBuildInfo}</div> | 182 <div class="start">$i18n{aboutDetailedBuildInfo}</div> |
| 180 <button class="subpage-arrow" is="paper-icon-button-light" | 183 <button class="subpage-arrow" is="paper-icon-button-light" |
| 181 aria-label="$i18n{aboutDetailedBuildInfo}"> | 184 aria-label="$i18n{aboutDetailedBuildInfo}"> |
| 182 </button> | 185 </button> |
| 183 </div> | 186 </div> |
| 184 </if> | 187 </if> |
| 185 <div class="settings-box product-info copyable"> | 188 <div class="settings-box padded block copyable"> |
| 186 <div class="info-section"> | 189 <div class="info-section"> |
| 187 <div class="secondary">$i18n{aboutProductTitle}</div> | 190 <div class="secondary">$i18n{aboutProductTitle}</div> |
| 188 <div class="secondary">$i18n{aboutProductCopyright}</div> | 191 <div class="secondary">$i18n{aboutProductCopyright}</div> |
| 189 </div> | 192 </div> |
| 190 | 193 |
| 191 <div class="info-section"> | 194 <div class="info-section"> |
| 192 <div class="secondary">$i18nRaw{aboutProductLicense}</div> | 195 <div class="secondary">$i18nRaw{aboutProductLicense}</div> |
| 193 <if expr="chromeos"> | 196 <if expr="chromeos"> |
| 194 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div> | 197 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div> |
| 195 </if> | 198 </if> |
| 196 </div> | 199 </div> |
| 197 <if expr="_google_chrome"> | 200 <if expr="_google_chrome"> |
| 198 <div class="secondary">$i18nRaw{aboutProductTos}</div> | 201 <div class="secondary">$i18nRaw{aboutProductTos}</div> |
| 199 </if> | 202 </if> |
| 200 </div> | 203 </div> |
| 201 <if expr="chromeos"> | 204 <if expr="chromeos"> |
| 202 <div class="settings-box product-info" id="regulatoryInfo" | 205 <div class="settings-box padded block" id="regulatoryInfo" |
| 203 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]"> | 206 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]"> |
| 204 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]"> | 207 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]"> |
| 205 </div> | 208 </div> |
| 206 </if> | 209 </if> |
| 207 </neon-animatable> | 210 </neon-animatable> |
| 208 <if expr="chromeos"> | 211 <if expr="chromeos"> |
| 209 <template is="dom-if" route-path="/help/details"> | 212 <template is="dom-if" route-path="/help/details"> |
| 210 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}"> | 213 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}"> |
| 211 <settings-detailed-build-info></settings-detailed-build-info> | 214 <settings-detailed-build-info></settings-detailed-build-info> |
| 212 </settings-subpage> | 215 </settings-subpage> |
| 213 </template> | 216 </template> |
| 214 </if> | 217 </if> |
| 215 </settings-animated-pages> | 218 </settings-animated-pages> |
| 216 </settings-section> | 219 </settings-section> |
| 217 </div> | 220 </div> |
| 218 </template> | 221 </template> |
| 219 <script src="about_page.js"></script> | 222 <script src="about_page.js"></script> |
| 220 </dom-module> | 223 </dom-module> |
| OLD | NEW |