| 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/about_page_browser_proxy.html"> | 2 <link rel="import" href="/about_page/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"> |
| 11 <link rel="import" href="/settings_shared_css.html"> | 11 <link rel="import" href="/settings_shared_css.html"> |
| 12 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 12 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 13 <link rel="import" href="chrome://resources/html/assert.html"> | 13 <link rel="import" href="chrome://resources/html/assert.html"> |
| 14 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 14 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| 19 | 19 |
| 20 <if expr="chromeos"> | 20 <if expr="chromeos"> |
| 21 <link rel="import" href="/about_page/detailed_build_info.html"> | 21 <link rel="import" href="/about_page/detailed_build_info.html"> |
| 22 <link rel="import" href="/settings_page/settings_subpage.html"> | 22 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 23 </if> | 23 </if> |
| 24 | 24 |
| 25 <dom-module id="settings-about-page"> | 25 <dom-module id="settings-about-page"> |
| 26 <template> | 26 <template> |
| 27 <style include="settings-shared settings-page-styles"> | 27 <style include="settings-shared settings-page-styles"> |
| 28 :host { |
| 29 --about-page-image-space: 10px; |
| 30 } |
| 31 |
| 28 .copyable { | 32 .copyable { |
| 29 -webkit-user-select: text; | 33 -webkit-user-select: text; |
| 30 } | 34 } |
| 31 | 35 |
| 32 .product-title { | 36 .product-title { |
| 33 font-size: 20px; | 37 font-size: 20px; |
| 34 margin-bottom: auto; | 38 margin-bottom: auto; |
| 35 margin-top: auto; | 39 margin-top: auto; |
| 36 } | 40 } |
| 37 | 41 |
| 38 img { | 42 img { |
| 39 -webkit-margin-end: 10px; | 43 -webkit-margin-end: var(--about-page-image-space); |
| 40 } | 44 } |
| 41 | 45 |
| 42 iron-icon { | 46 iron-icon { |
| 43 -webkit-margin-end: var(--iron-icon-spacing); | 47 -webkit-margin-end: var(--about-page-image-space); |
| 48 width: 32px; /* The width of the product-logo img. */ |
| 44 } | 49 } |
| 45 | 50 |
| 46 iron-icon[icon='settings:check-circle'] { | 51 iron-icon[icon='settings:check-circle'] { |
| 47 fill: var(--paper-blue-600); | 52 fill: var(--paper-blue-600); |
| 48 } | 53 } |
| 49 | 54 |
| 50 iron-icon[icon='settings:error'] { | 55 iron-icon[icon='settings:error'] { |
| 51 fill: var(--paper-red-600); | 56 fill: var(--paper-red-600); |
| 52 } | 57 } |
| 53 | 58 |
| 54 .product-info { | 59 .product-info { |
| 55 display: block; | 60 display: block; |
| 56 padding-bottom: 10px; | 61 padding-bottom: 10px; |
| 57 padding-top: 10px; | 62 padding-top: 10px; |
| 58 } | 63 } |
| 59 | 64 |
| 60 .info-section { | 65 .info-section { |
| 61 margin-bottom: 12px; | 66 margin-bottom: 12px; |
| 62 } | 67 } |
| 63 | 68 |
| 64 #regulatoryInfo img { | 69 #regulatoryInfo img { |
| 65 width: 330px; | 70 width: 330px; |
| 66 } | 71 } |
| 67 </style> | 72 </style> |
| 68 <div> | 73 <div> |
| 69 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> | 74 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> |
| 70 <settings-animated-pages id="pages" section="about"> | 75 <settings-animated-pages id="pages" section="about"> |
| 71 <neon-animatable route-path="default"> | 76 <neon-animatable route-path="default"> |
| 72 <div class="settings-box"> | 77 <div class="settings-box two-line"> |
| 73 <img id="product-logo" on-tap="onProductLogoTap_" | 78 <img id="product-logo" on-tap="onProductLogoTap_" |
| 74 srcset="chrome://theme/current-channel-logo@1x 1x, | 79 srcset="chrome://theme/current-channel-logo@1x 1x, |
| 75 chrome://theme/current-channel-logo@2x 2x" alt=""> | 80 chrome://theme/current-channel-logo@2x 2x" alt=""> |
| 76 <span class="product-title">$i18n{aboutProductTitle}</span> | 81 <span class="product-title">$i18n{aboutProductTitle}</span> |
| 77 </div> | 82 </div> |
| 78 <div class="settings-box two-line"> | 83 <div class="settings-box two-line"> |
| 79 <iron-icon | 84 <iron-icon |
| 80 hidden="[[!shouldShowUpdateStatusIcon_( | 85 hidden="[[!shouldShowUpdateStatusIcon_( |
| 81 currentUpdateStatusEvent_)]]" | 86 currentUpdateStatusEvent_)]]" |
| 82 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" | 87 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 97 </div> | 102 </div> |
| 98 <span id="deprecationWarning" | 103 <span id="deprecationWarning" |
| 99 hidden="[[!obsoleteSystemInfo_.obsolete]]"> | 104 hidden="[[!obsoleteSystemInfo_.obsolete]]"> |
| 100 $i18n{aboutObsoleteSystem} | 105 $i18n{aboutObsoleteSystem} |
| 101 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank"> | 106 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank"> |
| 102 $i18n{learnMore} | 107 $i18n{learnMore} |
| 103 </a> | 108 </a> |
| 104 </span> | 109 </span> |
| 105 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div> | 110 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div> |
| 106 </div> | 111 </div> |
| 107 <span class="secondary-action"> | 112 <span id="relaunchContainer" |
| 108 <paper-button id="relaunch" class="secondary-button" | |
| 109 <if expr="not chromeos"> | 113 <if expr="not chromeos"> |
| 110 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]" | 114 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]" |
| 111 </if> | 115 </if> |
| 112 <if expr="chromeos"> | 116 <if expr="chromeos"> |
| 113 hidden="[[!shouldShowRelaunch_( | 117 hidden="[[!shouldShowRelaunch_( |
| 114 currentUpdateStatusEvent_, targetChannel_)]]" | 118 currentUpdateStatusEvent_, targetChannel_)]]" |
| 115 </if> | 119 </if> |
| 120 class="secondary-action"> |
| 121 <paper-button id="relaunch" class="secondary-button" |
| 116 on-tap="onRelaunchTap_"> | 122 on-tap="onRelaunchTap_"> |
| 117 $i18n{aboutRelaunch} | 123 $i18n{aboutRelaunch} |
| 118 </paper-button> | 124 </paper-button> |
| 119 <if expr="chromeos"> | 125 <if expr="chromeos"> |
| 120 <paper-button id="relaunchAndPowerwash" class="secondary-button" | 126 <paper-button id="relaunchAndPowerwash" class="secondary-button" |
| 121 hidden="[[!shouldShowRelaunchAndPowerwash_( | 127 hidden="[[!shouldShowRelaunchAndPowerwash_( |
| 122 currentUpdateStatusEvent_, targetChannel_)]]" | 128 currentUpdateStatusEvent_, targetChannel_)]]" |
| 123 on-tap="onRelaunchAndPowerwashTap_"> | 129 on-tap="onRelaunchAndPowerwashTap_"> |
| 124 $i18n{aboutRelaunchAndPowerwash} | 130 $i18n{aboutRelaunchAndPowerwash} |
| 125 </paper-button> | 131 </paper-button> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 <settings-detailed-build-info></settings-detailed-build-info> | 181 <settings-detailed-build-info></settings-detailed-build-info> |
| 176 </settings-subpage> | 182 </settings-subpage> |
| 177 </template> | 183 </template> |
| 178 </if> | 184 </if> |
| 179 </settings-animated-pages> | 185 </settings-animated-pages> |
| 180 </settings-section> | 186 </settings-section> |
| 181 </div> | 187 </div> |
| 182 </template> | 188 </template> |
| 183 <script src="about_page.js"></script> | 189 <script src="about_page.js"></script> |
| 184 </dom-module> | 190 </dom-module> |
| OLD | NEW |