Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: chrome/browser/resources/settings/about_page/about_page.html

Issue 2698133003: MD Settings: About: Show connectionTypes message (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
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 .copyable { 36 .copyable {
37 -webkit-user-select: text; 37 -webkit-user-select: text;
38 } 38 }
39 39
40 .info-section {
41 margin-bottom: 12px;
42 }
43
44 .padded {
45 padding-bottom: 10px;
46 padding-top: 10px;
47 }
48
40 .product-title { 49 .product-title {
41 font-size: 153.85%; /* 20px / 13px */ 50 font-size: 153.85%; /* 20px / 13px */
42 margin-bottom: auto; 51 margin-bottom: auto;
43 margin-top: auto; 52 margin-top: auto;
44 } 53 }
45 54
46 img { 55 img {
47 -webkit-margin-end: var(--about-page-image-space); 56 -webkit-margin-end: var(--about-page-image-space);
48 } 57 }
49 58
50 iron-icon { 59 iron-icon {
51 -webkit-margin-end: var(--about-page-image-space); 60 -webkit-margin-end: var(--about-page-image-space);
52 width: 32px; /* The width of the product-logo img. */ 61 width: 32px; /* The width of the product-logo img. */
53 } 62 }
54 63
55 iron-icon[icon='settings:check-circle'] { 64 iron-icon[icon='settings:check-circle'] {
56 fill: var(--paper-blue-600); 65 fill: var(--paper-blue-600);
57 } 66 }
58 67
59 iron-icon[icon='settings:error'] { 68 iron-icon[icon='settings:error'] {
60 fill: var(--paper-red-600); 69 fill: var(--paper-red-600);
61 } 70 }
62 71
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 { 72 #regulatoryInfo img {
74 width: 330px; 73 width: 330px;
75 } 74 }
76 75
77 <if expr="_google_chrome and is_macosx"> 76 <if expr="_google_chrome and is_macosx">
78 #promoteUpdater[disabled] { 77 #promoteUpdater[disabled] {
79 @apply(--settings-secondary); 78 @apply(--settings-secondary);
80 } 79 }
81 </if> 80 </if>
82 </style> 81 </style>
83 <div> 82 <div>
84 <settings-section page-title="$i18n{aboutPageTitle}" section="about"> 83 <settings-section page-title="$i18n{aboutPageTitle}" section="about">
85 <settings-animated-pages id="pages" section="about"> 84 <settings-animated-pages id="pages" section="about">
86 <neon-animatable route-path="default"> 85 <neon-animatable route-path="default">
87 <div class="settings-box two-line"> 86 <div class="settings-box two-line">
88 <img id="product-logo" on-tap="onProductLogoTap_" 87 <img id="product-logo" on-tap="onProductLogoTap_"
89 srcset="chrome://theme/current-channel-logo@1x 1x, 88 srcset="chrome://theme/current-channel-logo@1x 1x,
90 chrome://theme/current-channel-logo@2x 2x" alt=""> 89 chrome://theme/current-channel-logo@2x 2x" alt="">
91 <span class="product-title">$i18n{aboutProductTitle}</span> 90 <span class="product-title">$i18n{aboutProductTitle}</span>
92 </div> 91 </div>
93 <div class="settings-box two-line"> 92 <div class="settings-box two-line">
94 <!-- TODO(dpapad): Investigate why vulcanize does not handle well 93 <!-- TODO(dpapad): Investigate why vulcanize does not handle well
95 a new line after "getIconSrc_(", causes incorrect src URL --> 94 a new line after "getIconSrc_(", causes incorrect src URL -->
96 <iron-icon 95 <iron-icon
97 hidden="[[!showUpdateStatus_]]" 96 hidden="[[!showUpdateStatus_]]"
98 icon$="[[getIcon_( 97 icon$="[[getIcon_(
99 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]" 98 obsoleteSystemInfo_, currentUpdateStatusEvent_)]]"
100 src="[[getIconSrc_(obsoleteSystemInfo_, currentUpdateStatusEve nt_)]]"> 99 src="[[getIconSrc_(obsoleteSystemInfo_, currentUpdateStatusEve nt_)]]">
101 </iron-icon> 100 </iron-icon>
102 <div class="start"> 101 <div class="start padded">
103 <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]" 102 <div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]"
104 <if expr="not chromeos"> 103 <if expr="not chromeos">
105 inner-h-t-m-l="[[getUpdateStatusMessage_( 104 inner-h-t-m-l="[[getUpdateStatusMessage_(
106 currentUpdateStatusEvent_)]]"> 105 currentUpdateStatusEvent_)]]">
107 </if> 106 </if>
108 <if expr="chromeos"> 107 <if expr="chromeos">
109 inner-h-t-m-l="[[getUpdateStatusMessage_( 108 inner-h-t-m-l="[[getUpdateStatusMessage_(
110 currentUpdateStatusEvent_, targetChannel_)]]"> 109 currentUpdateStatusEvent_, targetChannel_)]]">
111 </if> 110 </if>
112 </div> 111 </div>
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 </if> 175 </if>
177 <if expr="chromeos"> 176 <if expr="chromeos">
178 <div class="settings-box" on-tap="onDetailedBuildInfoTap_" 177 <div class="settings-box" on-tap="onDetailedBuildInfoTap_"
179 actionable> 178 actionable>
180 <div class="start">$i18n{aboutDetailedBuildInfo}</div> 179 <div class="start">$i18n{aboutDetailedBuildInfo}</div>
181 <button class="subpage-arrow" is="paper-icon-button-light" 180 <button class="subpage-arrow" is="paper-icon-button-light"
182 aria-label="$i18n{aboutDetailedBuildInfo}"> 181 aria-label="$i18n{aboutDetailedBuildInfo}">
183 </button> 182 </button>
184 </div> 183 </div>
185 </if> 184 </if>
186 <div class="settings-box product-info copyable"> 185 <div class="settings-box padded block copyable">
187 <div class="info-section"> 186 <div class="info-section">
188 <div class="secondary">$i18n{aboutProductTitle}</div> 187 <div class="secondary">$i18n{aboutProductTitle}</div>
189 <div class="secondary">$i18n{aboutProductCopyright}</div> 188 <div class="secondary">$i18n{aboutProductCopyright}</div>
190 </div> 189 </div>
191 190
192 <div class="info-section"> 191 <div class="info-section">
193 <div class="secondary">$i18nRaw{aboutProductLicense}</div> 192 <div class="secondary">$i18nRaw{aboutProductLicense}</div>
194 <if expr="chromeos"> 193 <if expr="chromeos">
195 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div> 194 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div>
196 </if> 195 </if>
197 </div> 196 </div>
198 <if expr="_google_chrome"> 197 <if expr="_google_chrome">
199 <div class="secondary">$i18nRaw{aboutProductTos}</div> 198 <div class="secondary">$i18nRaw{aboutProductTos}</div>
200 </if> 199 </if>
201 </div> 200 </div>
202 <if expr="chromeos"> 201 <if expr="chromeos">
203 <div class="settings-box product-info" id="regulatoryInfo" 202 <div class="settings-box padded block" id="regulatoryInfo"
204 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]"> 203 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]">
205 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]"> 204 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]">
206 </div> 205 </div>
207 </if> 206 </if>
208 </neon-animatable> 207 </neon-animatable>
209 <if expr="chromeos"> 208 <if expr="chromeos">
210 <template is="dom-if" route-path="/help/details"> 209 <template is="dom-if" route-path="/help/details">
211 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}"> 210 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}">
212 <settings-detailed-build-info></settings-detailed-build-info> 211 <settings-detailed-build-info></settings-detailed-build-info>
213 </settings-subpage> 212 </settings-subpage>
214 </template> 213 </template>
215 </if> 214 </if>
216 </settings-animated-pages> 215 </settings-animated-pages>
217 </settings-section> 216 </settings-section>
218 </div> 217 </div>
219 </template> 218 </template>
220 <script src="about_page.js"></script> 219 <script src="about_page.js"></script>
221 </dom-module> 220 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698