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

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

Issue 2723403004: MD Settings: Internet details: Fix proxy toggle and polish (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/network_property_list.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_network _behavior.html"> 5 <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 _indicator.html"> 6 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network _indicator.html">
7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
8 <link rel="import" href="chrome://resources/html/polymer.html"> 8 <link rel="import" href="chrome://resources/html/polymer.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 9 <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-flex-layout/classe s/iron-flex-layout.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
(...skipping 14 matching lines...) Expand all
25 <template> 25 <template>
26 <style include="internet-shared"> 26 <style include="internet-shared">
27 :host { 27 :host {
28 padding-bottom: 40px; 28 padding-bottom: 40px;
29 } 29 }
30 30
31 cr-network-icon { 31 cr-network-icon {
32 -webkit-padding-end: 8px; 32 -webkit-padding-end: 8px;
33 } 33 }
34 34
35 cr-policy-network-indicator {
36 -webkit-margin-start: 10px;
37 }
38
39 iron-collapse { 35 iron-collapse {
40 margin: 10px 0; 36 margin: 10px 0;
41 } 37 }
42 38
43 iron-icon { 39 iron-icon {
44 -webkit-margin-end: 10px; 40 -webkit-margin-end: 10px;
45 } 41 }
46 42
43 paper-toggle-button,
44 cr-policy-network-indicator {
45 -webkit-margin-start: var(--checkbox-spacing);
46 }
47
47 /* Use <span> for subtitles so as not to interfere with 48 /* Use <span> for subtitles so as not to interfere with
48 * settings-box:first-of-type. */ 49 * settings-box:first-of-type. */
49 span.subtitle { 50 span.subtitle {
50 font-weight: 700; 51 font-weight: 700;
51 padding: 20px; 52 padding: 20px;
52 } 53 }
53 54
54 .advanced { 55 .advanced {
55 font-weight: 700; 56 font-weight: 700;
56 } 57 }
(...skipping 17 matching lines...) Expand all
74 #networkState { 75 #networkState {
75 -webkit-padding-start: 8px; 76 -webkit-padding-start: 8px;
76 /* TODO(stevenjb): Finalize font-size / style for this. */ 77 /* TODO(stevenjb): Finalize font-size / style for this. */
77 font-size: 125%; 78 font-size: 125%;
78 font-weight: 500; 79 font-weight: 500;
79 } 80 }
80 81
81 #networkState[connected] { 82 #networkState[connected] {
82 color: var(--google-green-500); 83 color: var(--google-green-500);
83 } 84 }
84
85 #proxyDiv {
86 max-width: 500px;
87 }
88 </style> 85 </style>
89 <!-- Title section: Icon + name + connection state. --> 86 <!-- Title section: Icon + name + connection state. -->
90 <div class="settings-box first"> 87 <div class="settings-box first">
91 <div class="start layout horizontal center"> 88 <div class="start layout horizontal center">
92 <cr-network-icon network-state="[[networkProperties]]"> 89 <cr-network-icon network-state="[[networkProperties]]">
93 </cr-network-icon> 90 </cr-network-icon>
94 <div id="networkState" 91 <div id="networkState"
95 connected$="[[isConnectedState_(networkProperties)]]"> 92 connected$="[[isConnectedState_(networkProperties)]]">
96 [[getStateText_(networkProperties)]] 93 [[getStateText_(networkProperties)]]
97 </div> 94 </div>
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 on-proxy-change="onProxyChange_" 272 on-proxy-change="onProxyChange_"
276 network-properties="[[networkProperties]]"> 273 network-properties="[[networkProperties]]">
277 </network-proxy> 274 </network-proxy>
278 </template> 275 </template>
279 </div> 276 </div>
280 </iron-collapse> 277 </iron-collapse>
281 </template> 278 </template>
282 </template> 279 </template>
283 <script src="internet_detail_page.js"></script> 280 <script src="internet_detail_page.js"></script>
284 </dom-module> 281 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/network_property_list.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698