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

Unified Diff: chrome/browser/resources/settings/internet_page/network_proxy.html

Issue 2889073002: Settings: Internet page cleanup (Closed)
Patch Set: Fix network_summary_item 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 side-by-side diff with in-line comments
Download patch
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 7cc30b5869cb099ecce4badd4866a57731d83282..d39dd9fe5236e9d46e77ca4eda965c86d159655c 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -25,7 +25,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">
dschuyler 2017/05/18 20:48:05 nit: if this can wrap, please wrap the line. I thi
stevenjb 2017/05/18 20:52:43 Breaking the string doesn't work, and wrapping aft
cr-policy-network-indicator {
-webkit-margin-end: 10px;
}
@@ -39,13 +39,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. -->
@@ -132,7 +132,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
@@ -174,9 +174,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}}">

Powered by Google App Engine
This is Rietveld 408576698