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

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

Issue 1979693002: [MD settings] removing .css files from internet settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge with master Created 4 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l"> 5 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm l">
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="network_property_list.html"> 8 <link rel="import" href="network_property_list.html">
9 <link rel="import" href="network_proxy_input.html"> 9 <link rel="import" href="network_proxy_input.html">
10 <link rel="import" href="network_proxy_exclusions.html"> 10 <link rel="import" href="network_proxy_exclusions.html">
11 11
12 <dom-module id="network-proxy"> 12 <dom-module id="network-proxy">
13 <link rel="import" type="css" href="network_proxy.css">
14 <template> 13 <template>
14 <style>
15 :host {
16 display: inline-block;
17 }
18
19 #selectTypeDiv {
20 margin: 10px 0;
21 }
22
23 select {
24 padding: 5px;
25 }
26
27 span {
28 margin: 5px;
29 }
30
31 cr-policy-network-indicator {
32 -webkit-margin-end: 10px;
33 mwrgin-bottom: 5px;
34 }
35
36 paper-checkbox {
37 margin-bottom: 10px;
38 }
39
40 paper-input {
41 margin: -9px 5px 0;
42 }
43 </style>
15 <div id="outer" class="layout vertical flex"> 44 <div id="outer" class="layout vertical flex">
16 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. --> 45 <!-- TODO(stevenjb): Use cr-dropdown-menu once available. -->
17 <div class="layout horizontal center" hidden$= 46 <div class="layout horizontal center" hidden$=
18 "[[!isNetworkPolicyControlled(networkProperties.ProxySettings.Type)]]" > 47 "[[!isNetworkPolicyControlled(networkProperties.ProxySettings.Type)]]" >
19 <cr-policy-network-indicator 48 <cr-policy-network-indicator
20 property="[[networkProperties.ProxySettings.Type]]"> 49 property="[[networkProperties.ProxySettings.Type]]">
21 </cr-policy-network-indicator> 50 </cr-policy-network-indicator>
22 <span>This proxy is enforced by your administrator.</span> 51 <span>This proxy is enforced by your administrator.</span>
23 </div> 52 </div>
24 53
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 </paper-input> 118 </paper-input>
90 <paper-button on-tap="onAddProxyExclusionTap_"> 119 <paper-button on-tap="onAddProxyExclusionTap_">
91 Add Exception 120 Add Exception
92 </paper-button> 121 </paper-button>
93 </div> 122 </div>
94 </div> 123 </div>
95 </div> 124 </div>
96 </template> 125 </template>
97 <script src="network_proxy.js"></script> 126 <script src="network_proxy.js"></script>
98 </dom-module> 127 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698