Commit 0b412130 authored by henry's avatar henry
Browse files

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 42036: Implement new bridge settings UI, ready for Lox.
parent dc354cb3

browser/components/torpreferences/content/bridge-qr.svg

0 → 100644
+3 −0
Changes for browser/components/torpreferences/content/bridge-qr.svg: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<svg width="24" height="24" viewBox="0 0 24 24" fill="context-fill" xmlns="http://www.w3.org/2000/svg">

  <path d="M5.5 3C4.83696 3 4.20107 3.26339 3.73223 3.73223C3.26339 4.20107 3 4.83696 3 5.5V9H4.75V5.5C4.75 5.30109 4.82902 5.11032 4.96967 4.96967C5.11032 4.82902 5.30109 4.75 5.5 4.75H9V3H5.5ZM11 10.25C11 10.4489 10.921 10.6397 10.7803 10.7803C10.6397 10.921 10.4489 11 10.25 11H7.75C7.55109 11 7.36032 10.921 7.21967 10.7803C7.07902 10.6397 7 10.4489 7 10.25V7.75C7 7.55109 7.07902 7.36032 7.21967 7.21967C7.36032 7.07902 7.55109 7 7.75 7H10.25C10.4489 7 10.6397 7.07902 10.7803 7.21967C10.921 7.36032 11 7.55109 11 7.75V10.25ZM17 15H15V13H17V11H15V9H17V7H15V9H13V11H15V13H13V15H11V13H9V15H7V17H9V15H11V17H13V15H15V17H17V15ZM3 18.5V15H4.75V18.5C4.75 18.914 5.086 19.25 5.5 19.25H9V21H5.5C4.83696 21 4.20107 20.7366 3.73223 20.2678C3.26339 19.7989 3 19.163 3 18.5ZM15 3H18.5C19.163 3 19.7989 3.26339 20.2678 3.73223C20.7366 4.20107 21 4.83696 21 5.5V9H19.25V5.5C19.25 5.30109 19.171 5.11032 19.0303 4.96967C18.8897 4.82902 18.6989 4.75 18.5 4.75H15V3ZM21 18.5V15H19.25V18.5C19.25 18.6989 19.171 18.8897 19.0303 19.0303C18.8897 19.171 18.6989 19.25 18.5 19.25H15V21H18.5C19.163 21 19.7989 20.7366 20.2678 20.2678C20.7366 19.7989 21 19.163 21 18.5Z"/>

</svg>

browser/components/torpreferences/content/bridge.svg

0 → 100644
+5 −0
Changes for browser/components/torpreferences/content/bridge.svg: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line 
<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">

  <path d="M15.5 11.5C15.5 7.35786 12.1421 4 8 4C3.85786 4 0.5 7.35786 0.5 11.5V12.7461H1.67188V11.5C1.67188 8.00507 4.50507 5.17188 8 5.17188C11.4949 5.17188 14.3281 8.00507 14.3281 11.5V12.7461H15.5V11.5Z"/>

  <path d="M13.25 11.5C13.25 8.6005 10.8995 6.24999 7.99999 6.24999C5.1005 6.24999 2.74999 8.6005 2.74999 11.5L2.74989 12.7461H3.92177L3.92187 11.5C3.92187 9.24771 5.74771 7.42187 7.99999 7.42187C10.2523 7.42187 12.0781 9.24771 12.0781 11.5L12.0782 12.7461H13.2501L13.25 11.5Z"/>

  <path d="M8 8.5C9.65686 8.5 11 9.84315 11 11.5L11.0002 12.7461H9.82836L9.82813 11.5C9.82813 10.4904 9.00965 9.67188 8 9.67188C6.99036 9.67188 6.17188 10.4904 6.17188 11.5L6.17164 12.7461H4.99977V11.5C4.99977 9.84315 6.34315 8.5 8 8.5Z"/>

</svg>

browser/components/torpreferences/content/builtinBridgeDialog.mjs

+4 −2
Changes for browser/components/torpreferences/content/builtinBridgeDialog.mjs: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -69,8 +69,10 @@ export class BuiltinBridgeDialog { 
      optionEl.querySelector(

        ".torPreferences-current-bridge-label"

      ).textContent = TorStrings.settings.currentBridge;

      optionEl.classList.toggle(

        "current-builtin-bridge-type",

      optionEl

        .querySelector(".bridge-status-badge")

        .classList.toggle(

          "bridge-status-current-built-in",

          type === currentBuiltinType

        );

    }

browser/components/torpreferences/content/builtinBridgeDialog.xhtml

+6 −6
Changes for browser/components/torpreferences/content/builtinBridgeDialog.xhtml: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
            aria-describedby="obfs-bridges-current obfs-bridges-description"

            value="obfs4"

          />

          <html:span class="torPreferences-current-bridge-badge">

            <image class="torPreferences-current-bridge-icon" />

          <html:span class="bridge-status-badge">

            <html:div class="bridge-status-icon"></html:div>

            <html:span

              id="obfs-bridges-current"

              class="torPreferences-current-bridge-label"
@@ -41,8 +41,8 @@ 
            aria-describedby="snowflake-bridges-current snowflake-bridges-description"

            value="snowflake"

          />

          <html:span class="torPreferences-current-bridge-badge">

            <image class="torPreferences-current-bridge-icon" />

          <html:span class="bridge-status-badge">

            <html:div class="bridge-status-icon"></html:div>

            <html:span

              id="snowflake-bridges-current"

              class="torPreferences-current-bridge-label"
@@ -62,8 +62,8 @@ 
            aria-describedby="meek-bridges-current meek-bridges-description"

            value="meek-azure"

          />

          <html:span class="torPreferences-current-bridge-badge">

            <image class="torPreferences-current-bridge-icon" />

          <html:span class="bridge-status-badge">

            <html:div class="bridge-status-icon"></html:div>

            <html:span

              id="meek-bridges-current"

              class="torPreferences-current-bridge-label"

browser/components/torpreferences/content/connectionPane.js

+1654 −15

File changed.

Preview size limit exceeded, changes collapsed.