Verified Commit d51f004c authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Bug 30237: Add v3 onion services client authentication prompt 

Bug 42092: Fix layout styling of saved onion keys dialog.
parent 67ce8609

browser/components/onionservices/content/authPreferences.css

+11 −4
Original line number Diff line number Diff line
@@ -3,7 +3,11 @@ 
@import url("chrome://browser/skin/browser-colors.css");



#torOnionServiceKeys-overview-container {

  margin-right: 30px;

  margin-inline-end: 30px;

}



#onionservices-savedkeys-dialog {

  min-width: 45em;

}



#onionservices-savedkeys-tree treechildren::-moz-tree-cell-text {
@@ -11,14 +15,17 @@ 
}



#onionservices-savedkeys-errorContainer {

  margin-top: 4px;

  margin-block-start: 4px;

  min-height: 3em;

}



#onionservices-savedkeys-errorContainer:not(.show-error) {

  visibility: hidden;

}



#onionservices-savedkeys-errorIcon {

  margin-right: 4px;

  margin-inline-end: 4px;

  list-style-image: url("chrome://global/skin/icons/warning.svg");

  -moz-context-properties: fill;

  fill: var(--warning-color);

  visibility: hidden;

}

browser/components/onionservices/content/savedKeysDialog.js

+4 −4
Original line number Diff line number Diff line
@@ -189,10 +189,10 @@ var gOnionServicesSavedKeysDialog = { 
  },



  _showError(aMessage) {

    const dialog = document.querySelector(this.selector.dialog);

    const errorIcon = dialog.querySelector(this.selector.errorIcon);

    errorIcon.style.visibility = aMessage ? "visible" : "hidden";

    const errorDesc = dialog.querySelector(this.selector.errorMessage);

    document

      .getElementById("onionservices-savedkeys-errorContainer")

      .classList.toggle("show-error", !!aMessage);

    const errorDesc = document.querySelector(this.selector.errorMessage);

    errorDesc.textContent = aMessage ? aMessage : "";

  },

browser/components/onionservices/content/savedKeysDialog.xhtml

+1 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
  id="onionservices-savedkeys-dialog"

  windowtype="OnionServices:SavedKeys"

  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

  style="width: 45em"

>

  <script src="chrome://browser/content/onionservices/savedKeysDialog.js" />
@@ -23,8 +22,6 @@ 
      id="onionservices-savedkeys-tree"

      flex="1"

      hidecolumnpicker="true"

      width="750"

      style="height: 20em"

      onselect="gOnionServicesSavedKeysDialog.updateButtonsState();"

    >

      <treecols>
@@ -38,7 +35,7 @@ 
      </treecols>

      <treechildren />

    </tree>

    <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1">

    <hbox id="onionservices-savedkeys-errorContainer" align="center">

      <image id="onionservices-savedkeys-errorIcon" />

      <description id="onionservices-savedkeys-errorMessage" flex="1" />

    </hbox>