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

Side by Side Diff: chrome/browser/resources/settings/internet_page/internet_detail_page.html

Issue 2889073002: Settings: Internet page cleanup (Closed)
Patch Set: Created 3 years, 7 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/cr_elements/cr_expand_button/cr_expa nd_button.html"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html"> 3 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_icon. html">
4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 4 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.html"> 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat or.html">
6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html"> 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _behavior.html">
7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html"> 7 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
8 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 8 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
9 <link rel="import" href="chrome://resources/html/polymer.html"> 9 <link rel="import" href="chrome://resources/html/polymer.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
(...skipping 13 matching lines...) Expand all
24 <link rel="import" href="network_siminfo.html"> 24 <link rel="import" href="network_siminfo.html">
25 <link rel="import" href="tether_connection_dialog.html"> 25 <link rel="import" href="tether_connection_dialog.html">
26 26
27 <dom-module id="settings-internet-detail-page"> 27 <dom-module id="settings-internet-detail-page">
28 <template> 28 <template>
29 <style include="internet-shared iron-flex"> 29 <style include="internet-shared iron-flex">
30 :host { 30 :host {
31 padding-bottom: 40px; 31 padding-bottom: 40px;
32 } 32 }
33 33
34 cr-network-icon {
35 -webkit-padding-end: 8px;
36 }
37
38 iron-collapse { 34 iron-collapse {
39 margin: 10px 0; 35 margin: 10px 0;
40 } 36 }
41 37
42 iron-icon { 38 iron-icon {
43 -webkit-margin-end: 10px; 39 -webkit-margin-end: 10px;
44 } 40 }
45 41
46 paper-toggle-button { 42 paper-toggle-button {
47 -webkit-margin-start: var(--settings-control-label-spacing); 43 -webkit-margin-start: var(--settings-control-label-spacing);
48 } 44 }
49 45
50 cr-policy-network-indicator, 46 cr-policy-network-indicator,
51 cr-policy-indicator { 47 cr-policy-indicator {
52 -webkit-margin-start: var(--settings-controlled-by-spacing); 48 -webkit-margin-start: var(--settings-controlled-by-spacing);
53 } 49 }
54 50
55 .indented { 51 .indented {
56 -webkit-margin-start: var(--settings-box-row-padding); 52 -webkit-margin-start: var(--settings-box-row-padding);
57 } 53 }
58 54
59 .settings-box.stretch { 55 .settings-box.stretch {
60 align-items: stretch; 56 align-items: stretch;
61 } 57 }
62 58
63 .settings-box:first-of-type { 59 .settings-box:first-of-type {
64 border-top: none; 60 border-top: none;
65 } 61 }
66 62
67 #buttonDiv paper-button {
68 /* Align text edge with trailing margin (12px button padding) */
69 -webkit-margin-end: -12px;
70 /* 8px spacing between highlight edges. */
71 -webkit-margin-start: calc(12px + 8px);
72 margin-bottom: 10px;
73 margin-top: 10px;
74 }
75
76 #networkState { 63 #networkState {
77 -webkit-padding-start: 8px;
78 font-size: 107.69%; /* 14px / 13px */ 64 font-size: 107.69%; /* 14px / 13px */
79 font-weight: 500; 65 font-weight: 500;
80 } 66 }
81 67
82 #networkState[connected] { 68 #networkState[connected] {
83 color: var(--google-green-500); 69 color: var(--google-green-500);
84 } 70 }
85 </style> 71 </style>
86 <!-- Title section: Icon + name + connection state. --> 72 <!-- Title section: Icon + name + connection state. -->
87 <div class="settings-box first"> 73 <div class="settings-box first">
88 <div class="start layout horizontal center"> 74 <div class="start layout horizontal center">
89 <cr-network-icon network-state="[[networkProperties]]"> 75 <cr-network-icon network-state="[[networkProperties]]">
90 </cr-network-icon> 76 </cr-network-icon>
91 <div id="networkState" 77 <div id="networkState"
92 connected$="[[isConnectedState_(networkProperties)]]"> 78 connected$="[[isConnectedState_(networkProperties)]]">
93 [[getStateText_(networkProperties)]] 79 [[getStateText_(networkProperties)]]
94 </div> 80 </div>
95 <template is="dom-if" 81 <template is="dom-if"
96 if="[[isPolicySource(networkProperties.Source))]]"> 82 if="[[isPolicySource(networkProperties.Source))]]">
97 <cr-policy-indicator 83 <cr-policy-indicator
98 indicator-type="[[getIndicatorTypeForSource( 84 indicator-type="[[getIndicatorTypeForSource(
99 networkProperties.Source)]]"> 85 networkProperties.Source)]]">
100 </cr-policy-indicator> 86 </cr-policy-indicator>
101 </template> 87 </template>
102 </div> 88 </div>
103 <div id="buttonDiv" class="layout horizontal center"> 89 <div id="buttonDiv" class="button-container">
104 <template is="dom-if" if="[[!isSecondaryUser_]]"> 90 <template is="dom-if" if="[[!isSecondaryUser_]]">
105 <paper-button class="secondary-button" on-tap="onForgetTap_" 91 <paper-button class="secondary-button" on-tap="onForgetTap_"
106 hidden$="[[!showForget_(networkProperties)]]"> 92 hidden$="[[!showForget_(networkProperties)]]">
107 $i18n{networkButtonForget} 93 $i18n{networkButtonForget}
108 </paper-button> 94 </paper-button>
109 <paper-button class="secondary-button" on-tap="onViewAccountTap_" 95 <paper-button class="secondary-button" on-tap="onViewAccountTap_"
110 hidden$="[[!showViewAccount_(networkProperties)]]"> 96 hidden$="[[!showViewAccount_(networkProperties)]]">
111 $i18n{networkButtonViewAccount} 97 $i18n{networkButtonViewAccount}
112 </paper-button> 98 </paper-button>
113 <paper-button class="secondary-button" on-tap="onActivateTap_" 99 <paper-button class="secondary-button" on-tap="onActivateTap_"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 277
292 <!-- Proxy toggle --> 278 <!-- Proxy toggle -->
293 <div class="settings-box" actionable on-tap="toggleProxyExpanded_"> 279 <div class="settings-box" actionable on-tap="toggleProxyExpanded_">
294 <div class="start">$i18n{networkSectionProxy}</div> 280 <div class="start">$i18n{networkSectionProxy}</div>
295 <cr-expand-button expanded="{{proxyExpanded_}}" 281 <cr-expand-button expanded="{{proxyExpanded_}}"
296 alt="$i18n{networkSectionProxyExpandA11yLabel}"> 282 alt="$i18n{networkSectionProxyExpandA11yLabel}">
297 </cr-expand-button> 283 </cr-expand-button>
298 </div> 284 </div>
299 285
300 <iron-collapse opened="[[proxyExpanded_]]"> 286 <iron-collapse opened="[[proxyExpanded_]]">
301 <network-proxy editable prefs="{{prefs}}" 287 <div class="layout vertical indented">
302 on-proxy-change="onProxyChange_" 288 <network-proxy editable prefs="{{prefs}}"
303 network-properties="[[networkProperties]]"> 289 on-proxy-change="onProxyChange_"
304 </network-proxy> 290 network-properties="[[networkProperties]]">
291 </network-proxy>
292 </div>
305 </iron-collapse> 293 </iron-collapse>
306 </template> 294 </template>
307 </template> 295 </template>
308 296
309 <tether-connection-dialog id="tetherDialog" 297 <tether-connection-dialog id="tetherDialog"
310 network-properties="[[networkProperties]]" 298 network-properties="[[networkProperties]]"
311 on-tether-connect="onTetherConnect_" 299 on-tether-connect="onTetherConnect_"
312 on-close="onTetherDialogClose_"> 300 on-close="onTetherDialogClose_">
313 </tether-connection-dialog> 301 </tether-connection-dialog>
314 </template> 302 </template>
315 <script src="internet_detail_page.js"></script> 303 <script src="internet_detail_page.js"></script>
316 </dom-module> 304 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698