Commit 93ecfbc3 authored by henry's avatar henry Committed by morgan
Browse files

fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser 

Bug 41811: Only use tor outline color for tor-button elements.

In particular, a `.primary:not(.tor-button)` element will have the
default blue outline.
parent 5c04abb6

browser/themes/shared/tor-urlbar-button.css

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
   * urlbar background, but we keep the rounded corners. */

  outline: var(--focus-outline);

  outline-offset: var(--focus-outline-offset);

  outline-color: var(--tor-focus-outline-color);

  /* Calculate the difference between the button's border area and the outline

   * area. */

  --tor-urlbar-focus-outline-difference: calc(

toolkit/components/torconnect/content/aboutTorConnect.css

+0 −4
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ html { 
  list-style-image: url("chrome://global/content/torconnect/bridge.svg");

}



button, select {

  --in-content-focus-outline-color: var(--tor-focus-outline-color);

}



#locationDropdownLabel {

  margin-block: auto;

  margin-inline: 4px;

toolkit/components/torconnect/content/aboutTorConnect.html

+10 −2
Original line number Diff line number Diff line
@@ -75,8 +75,16 @@ 
            <button id="restartButton" hidden="true"></button>

            <button id="configureButton" hidden="true"></button>

            <button id="cancelButton" hidden="true"></button>

            <button id="connectButton" hidden="true"></button>

            <button id="tryBridgeButton" hidden="true"></button>

            <button

              id="connectButton"

              hidden="true"

              class="tor-button"

            ></button>

            <button

              id="tryBridgeButton"

              hidden="true"

              class="tor-button"

            ></button>

          </span>

        </div>

      </div>

toolkit/components/torconnect/content/aboutTorConnect.js

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ class AboutTorConnect { 


  show(element, primary = false) {

    element.classList.toggle("primary", primary);

    element.classList.toggle("tor-button", primary);

    element.removeAttribute("hidden");

  }