| Index: chrome/browser/resources/settings/internet_page/network_proxy.html
|
| diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| index 08e25c95ceb6101d4db251d9145cc103af9069a6..55e202cefbe6b09b7e64525fd045654ae2808abf 100644
|
| --- a/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| +++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
|
| @@ -26,7 +26,7 @@
|
|
|
| <dom-module id="network-proxy">
|
| <template>
|
| - <style include="internet-shared md-select cr-hidden-style iron-flex">
|
| + <style include="internet-shared md-select cr-hidden-style iron-flex iron-flex-alignment">
|
| cr-policy-network-indicator {
|
| -webkit-margin-end: 10px;
|
| }
|
| @@ -40,13 +40,13 @@
|
| margin-bottom: 10px;
|
| }
|
|
|
| - #exceptionsDiv {
|
| - padding: 10px 0;
|
| - }
|
| -
|
| network-proxy-exclusions {
|
| margin: 10px 0;
|
| }
|
| +
|
| + #manualProxy {
|
| + @apply(--settings-list-frame-padding);
|
| + }
|
| </style>
|
|
|
| <!-- Policy indicator. Only one dom-if below will be shown. -->
|
| @@ -133,7 +133,7 @@
|
| </paper-toggle-button>
|
| </div>
|
|
|
| - <div class="list-frame"
|
| + <div id="manualProxy" class="layout vertical start"
|
| hidden$="[[!matches_(proxy_.Type, ProxySettingsType_.MANUAL)]]">
|
| <div hidden$="[[!useSameProxy_]]" class="layout vertical">
|
| <network-proxy-input
|
| @@ -175,9 +175,8 @@
|
| </network-proxy-input>
|
| </div>
|
|
|
| - <div id="exceptionsDiv"
|
| - hidden="[[!isEditable_('Type', networkProperties, editable,
|
| - useSharedProxies_)]]">
|
| + <div hidden="[[!isEditable_('Type', networkProperties, editable,
|
| + useSharedProxies_)]]">
|
| <div>$i18n{networkProxyExceptionList}</div>
|
| <network-proxy-exclusions on-proxy-change="onProxyExclusionsChange_"
|
| exclusions="{{proxy_.ExcludeDomains}}">
|
|
|