diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-14 01:54:58 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-14 01:54:58 +0100 |
| commit | 8e0fdf93181979cff67ebbf78afbf64cd4b729a5 (patch) | |
| tree | 2119534f40fc86aa996af4f849419e627fb47ed1 | |
| parent | 1e0da1994d03786571f4f97399595c5910f3a4c2 (diff) | |
| download | UXP-8e0fdf93181979cff67ebbf78afbf64cd4b729a5.tar UXP-8e0fdf93181979cff67ebbf78afbf64cd4b729a5.tar.gz UXP-8e0fdf93181979cff67ebbf78afbf64cd4b729a5.tar.lz UXP-8e0fdf93181979cff67ebbf78afbf64cd4b729a5.tar.xz UXP-8e0fdf93181979cff67ebbf78afbf64cd4b729a5.zip | |
Move "No proxy for" control down to clarify it is a global effect.
Follow-up to the behavior change in commit
6567bb631a78033b6b4cc32bc93e07d837652276
| -rw-r--r-- | application/basilisk/components/preferences/connection.xul | 6 | ||||
| -rw-r--r-- | application/palemoon/components/preferences/connection.xul | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/application/basilisk/components/preferences/connection.xul b/application/basilisk/components/preferences/connection.xul index a3f0d082a..1eb0c1544 100644 --- a/application/basilisk/components/preferences/connection.xul +++ b/application/basilisk/components/preferences/connection.xul @@ -145,9 +145,6 @@ </radiogroup> </box> </row> - <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/> - <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/> - <label value="&noproxyExplain.label;" control="networkProxyNone"/> </rows> </grid> <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/> @@ -162,6 +159,9 @@ </radiogroup> </groupbox> <separator class="thin"/> + <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/> + <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/> + <label value="&noproxyExplain.label;" control="networkProxyNone"/> <checkbox id="autologinProxy" label="&autologinproxy.label;" accesskey="&autologinproxy.accesskey;" diff --git a/application/palemoon/components/preferences/connection.xul b/application/palemoon/components/preferences/connection.xul index 491bf4878..e6079dd54 100644 --- a/application/palemoon/components/preferences/connection.xul +++ b/application/palemoon/components/preferences/connection.xul @@ -138,9 +138,6 @@ <radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;"/> </radiogroup> </row> - <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/> - <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/> - <label value="&noproxyExplain.label;" control="networkProxyNone"/> </rows> </grid> <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/> @@ -154,6 +151,9 @@ </hbox> </radiogroup> <separator class="thin"/> + <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/> + <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on" multiline="true" rows="2"/> + <label value="&noproxyExplain.label;" control="networkProxyNone"/> <checkbox id="autologinProxy" preference="signon.autologin.proxy" label="&autologinproxy.label;" accesskey="&autologinproxy.accesskey;" tooltiptext="&autologinproxy.tooltip;"/> |