October 2021 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 25658: Replace security slider with security level UI
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 4282cea750761d67dd55a8753df4370cba156d56 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Sep 16 16:11:33 2021 -0500 fixup! Bug 25658: Replace security slider with security level UI --- .../securitylevel/content/securityLevel.js | 86 +++++++++++------- .../securitylevel/content/securityLevelButton.css | 21 +++-- .../securitylevel/content/securityLevelButton.svg | 21 ----- .../securitylevel/content/securityLevelIcon.svg | 40 +++++++++ .../securitylevel/content/securityLevelPanel.css | 100 ++++++++++----------- .../content/securityLevelPanel.inc.xhtml | 67 ++++++++------ .../content/securityLevelPreferences.css | 14 ++- browser/components/securitylevel/jar.mn | 2 +- browser/modules/TorStrings.jsm | 4 + .../themes/shared/customizableui/panelUI.inc.css | 3 +- 10 files changed, 208 insertions(+), 150 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index b47d0cfb545e..8b8babe5b58e 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -73,19 +73,19 @@ const SecurityLevelButton = { _configUIFromPrefs : function(securityLevelButton) { if (securityLevelButton != null) { let securitySlider = SecurityLevelPrefs.securitySlider; - let classList = securityLevelButton.classList; - classList.remove("standard", "safer", "safest"); + securityLevelButton.removeAttribute("level"); + const securityCustom = SecurityLevelPrefs.securityCustom; switch(securitySlider) { case 4: - classList.add("standard"); + securityLevelButton.setAttribute("level", `standard${securityCustom ? "_custom" : ""}`); securityLevelButton.setAttribute("tooltiptext", TorStrings.securityLevel.standard.tooltip); break; case 2: - classList.add("safer"); + securityLevelButton.setAttribute("level", `safer${securityCustom ? "_custom" : ""}`); securityLevelButton.setAttribute("tooltiptext", TorStrings.securityLevel.safer.tooltip); break; case 1: - classList.add("safest"); + securityLevelButton.setAttribute("level", `safest${securityCustom ? "_custom" : ""}`); securityLevelButton.setAttribute("tooltiptext", TorStrings.securityLevel.safest.tooltip); break; } @@ -136,7 +136,7 @@ const SecurityLevelButton = { observe : function(subject, topic, data) { switch(topic) { case "nsPref:changed": - if (data == "security_slider") { + if (data === "security_slider" || data === "security_custom") { this._configUIFromPrefs(this.button); } break; @@ -166,9 +166,13 @@ const SecurityLevelButton = { // Library, and the Hamburger menus. Using oncommand alone would result in only getting fired // after onclick, which is mousedown followed by mouseup. onCommand : function(aEvent) { - // snippet stolen from /browser/components/downloads/indicator.js DownloadsIndicatorView.onCommand(evt) + // snippet borrowed from /browser/components/downloads/content/indicator.js DownloadsIndicatorView.onCommand(evt) if ( - (aEvent.type == "mousedown" && aEvent.button != 0) || + // On Mac, ctrl-click will send a context menu event from the widget, so + // we don't want to bring up the panel when ctrl key is pressed. + (aEvent.type == "mousedown" && + (aEvent.button != 0 || + (AppConstants.platform == "macosx" && aEvent.ctrlKey))) || (aEvent.type == "keypress" && aEvent.key != " " && aEvent.key != "Enter") ) { return; @@ -178,6 +182,7 @@ const SecurityLevelButton = { // while the security level panel is open this.button.setAttribute("open", "true"); SecurityLevelPanel.show(); + aEvent.stopPropagation(); }, }; /* Security Level Button */ @@ -193,25 +198,42 @@ const SecurityLevelPanel = { _anchor : null, _populated : false, + _selectors: Object.freeze({ + panel: "panel#securityLevel-panel", + icon: "vbox#securityLevel-vbox>vbox", + header: "h1#securityLevel-header", + level: "label#securityLevel-level", + custom: "label#securityLevel-custom", + summary: "description#securityLevel-summary", + learnMore: "label#securityLevel-learnMore", + restoreDefaults: "button#securityLevel-restoreDefaults", + advancedSecuritySettings: "button#securityLevel-advancedSecuritySettings", + }), + _populateXUL : function() { - // get the panel elements we need to populate - let panelview = document.getElementById("securityLevel-panelview"); - let labelHeader = panelview.querySelector("#securityLevel-header"); - let labelCustomWarning = panelview.querySelector("#securityLevel-customWarning") - let labelLearnMore = panelview.querySelector("#securityLevel-learnMore"); - let buttonRestoreDefaults = panelview.querySelector("#securityLevel-restoreDefaults"); - let buttonAdvancedSecuritySettings = panelview.querySelector("#securityLevel-advancedSecuritySettings"); - - labelHeader.setAttribute("value", TorStrings.securityLevel.securityLevel); - labelCustomWarning.setAttribute("value", TorStrings.securityLevel.customWarning); - labelLearnMore.setAttribute("value", TorStrings.securityLevel.learnMore); - labelLearnMore.setAttribute("href", TorStrings.securityLevel.learnMoreURL); - buttonRestoreDefaults.setAttribute("label", TorStrings.securityLevel.restoreDefaults); - buttonAdvancedSecuritySettings.setAttribute("label", TorStrings.securityLevel.advancedSecuritySettings); + let selectors = this._selectors; + + this._elements = { + panel: document.querySelector(selectors.panel), + icon: document.querySelector(selectors.icon), + header: document.querySelector(selectors.header), + levelLabel: document.querySelector(selectors.level), + customLabel: document.querySelector(selectors.custom), + summaryDescription: document.querySelector(selectors.summary), + learnMoreLabel: document.querySelector(selectors.learnMore), + restoreDefaultsButton: document.querySelector(selectors.restoreDefaults), + changeButton: document.querySelector(selectors.advancedSecuritySettings), + }; + let elements = this._elements; - // rest of the XUL is set based on security prefs - this._configUIFromPrefs(); + elements.header.textContent = TorStrings.securityLevel.securityLevel; + elements.customLabel.setAttribute("value", TorStrings.securityLevel.customWarning); + elements.learnMoreLabel.setAttribute("value", TorStrings.securityLevel.learnMore); + elements.learnMoreLabel.setAttribute("href", TorStrings.securityLevel.learnMoreURL); + elements.restoreDefaultsButton.setAttribute("label", TorStrings.securityLevel.restoreDefaults); + elements.changeButton.setAttribute("label", TorStrings.securityLevel.change); + this._configUIFromPrefs(); this._populated = true; }, @@ -221,12 +243,13 @@ const SecurityLevelPanel = { let securityCustom = SecurityLevelPrefs.securityCustom; // get the panel elements we need to populate - let panelview = document.getElementById("securityLevel-panelview"); - let labelLevel = panelview.querySelector("#securityLevel-level"); - let labelCustomWarning = panelview.querySelector("#securityLevel-customWarning") - let summary = panelview.querySelector("#securityLevel-summary"); - let buttonRestoreDefaults = panelview.querySelector("#securityLevel-restoreDefaults"); - let buttonAdvancedSecuritySettings = panelview.querySelector("#securityLevel-advancedSecuritySettings"); + let elements = this._elements; + let icon = elements.icon; + let labelLevel = elements.levelLabel; + let labelCustomWarning = elements.customLabel; + let summary = elements.summaryDescription; + let buttonRestoreDefaults = elements.restoreDefaultsButton; + let buttonAdvancedSecuritySettings = elements.changeButton; // only visible when user is using custom settings labelCustomWarning.hidden = !securityCustom; @@ -236,16 +259,19 @@ const SecurityLevelPanel = { switch(securitySlider) { // standard case 4: + icon.setAttribute("level", "standard"); labelLevel.setAttribute("value", TorStrings.securityLevel.standard.level); summary.textContent = TorStrings.securityLevel.standard.summary; break; // safer case 2: + icon.setAttribute("level", "safer"); labelLevel.setAttribute("value", TorStrings.securityLevel.safer.level); summary.textContent = TorStrings.securityLevel.safer.summary; break; // safest case 1: + icon.setAttribute("level", "safest"); labelLevel.setAttribute("value", TorStrings.securityLevel.safest.level); summary.textContent = TorStrings.securityLevel.safest.summary; break; diff --git a/browser/components/securitylevel/content/securityLevelButton.css b/browser/components/securitylevel/content/securityLevelButton.css index 81f2365bae28..38701250e9c9 100644 --- a/browser/components/securitylevel/content/securityLevelButton.css +++ b/browser/components/securitylevel/content/securityLevelButton.css @@ -1,9 +1,18 @@ -toolbarbutton#security-level-button.standard { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#standard"); +toolbarbutton#security-level-button[level="standard"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); } -toolbarbutton#security-level-button.safer { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#safer"); +toolbarbutton#security-level-button[level="safer"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer"); } -toolbarbutton#security-level-button.safest { - list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#safest"); +toolbarbutton#security-level-button[level="safest"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); } +toolbarbutton#security-level-button[level="standard_custom"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard_custom"); +} +toolbarbutton#security-level-button[level="safer_custom"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer_custom"); +} +toolbarbutton#security-level-button[level="safest_custom"] { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest_custom"); +} \ No newline at end of file diff --git a/browser/components/securitylevel/content/securityLevelButton.svg b/browser/components/securitylevel/content/securityLevelButton.svg deleted file mode 100644 index 8535cdcc531e..000000000000 --- a/browser/components/securitylevel/content/securityLevelButton.svg +++ /dev/null @@ -1,21 +0,0 @@ -<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <style> - use:not(:target) { - display: none; - } - </style> - <defs> - <g id="standard_icon" stroke="none" stroke-width="1"> - <path d="M7.0 2.16583509C7.0 2.16583509 2.0 4.24375717 2.0 4.24375717C2.0 4.24375717 2.0 7.27272727 2.0 7.27272727C2.0 10.2413541 4.13435329 13.0576771 7.0 13.9315843C9.8656467 13.0576771 12.0 10.2413541 12.0 7.27272727C12.0 7.27272727 12.0 4.24375717 12.0 4.24375717C12.0 4.24375717 7.0 2.16583509 7.0 2.16583509C7.0 2.16583509 7.0 2.16583509 7.0 2.16583509M7.0 0.0C7.0 0.0 14.0 2.90909091 14.0 2.90909091C14.0 2.90909091 14.0 7.27272727 14.0 7.27272727C14.0 11.3090909 11.0133333 15.0836364 7.0 16.0C2.98666667 15.0836364 0.0 11.3090909 0.0 7.27272727C0.0 7.27272727 0.0 2.90909091 0.0 2.90909091C0.0 2.90909091 7.0 0.0 7.0 0.0C7.0 0.0 7.0 0.0 7.0 0.0" /> - </g> - <g id="safer_icon" stroke="none" stroke-width="1"> - <path fill-rule="nonzero" d="M7.0 2.1658351C7.0 13.931584 7.0 2.1658351 7.0 13.931584C9.8656467 13.057677 12.0 10.241354 12.0 7.2727273C12.0 7.2727273 12.0 4.2437572 12.0 4.2437572C12.0 4.2437572 7.0 2.1658351 7.0 2.1658351C7.0 2.1658351 7.0 2.1658351 7.0 2.1658351M7.0 0.0C7.0 0.0 14.0 2.9090909 14.0 2.9090909C14.0 2.9090909 14.0 7.2727273 14.0 7.2727273C14.0 11.309091 11.013333 15.083636 7.0 16.0C2.9866667 15.083636 0.0 11.309091 0.0 7.2727273C0.0 7.2727273 0.0 2.9090909 0.0 2.9090909C0.0 2.9090909 7.0 0.0 7.0 0.0"/> - </g> - <g id="safest_icon" stroke="none" stroke-width="1"> - <path d="M7.0 0.0C7.0 0.0 14.0 2.90909091 14.0 2.90909091C14.0 2.90909091 14.0 7.27272727 14.0 7.27272727C14.0 11.3090909 11.0133333 15.0836364 7.0 16.0C2.98666667 15.0836364 0.0 11.3090909 0.0 7.27272727C0.0 7.27272727 0.0 2.90909091 0.0 2.90909091C0.0 2.90909091 7.0 0.0 7.0 0.0C7.0 0.0 7.0 0.0 7.0 0.0" /> - </g> - </defs> - <use id="standard" fill="context-fill" fill-opacity="context-fill-opacity" href="#standard_icon" /> - <use id="safer" fill="context-fill" fill-opacity="context-fill-opacity" href="#safer_icon" /> - <use id="safest" fill="context-fill" fill-opacity="context-fill-opacity" href="#safest_icon" /> -</svg> diff --git a/browser/components/securitylevel/content/securityLevelIcon.svg b/browser/components/securitylevel/content/securityLevelIcon.svg new file mode 100644 index 000000000000..38cdbcb68afc --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelIcon.svg @@ -0,0 +1,40 @@ +<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <style> + use:not(:target) { + display: none; + } + </style> + <defs> + <g id="standard_icon" stroke="none" stroke-width="1"> + <path clip-rule="evenodd" d="m8.49614.283505c-.30743-.175675-.68485-.175675-.99228.000001l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 4.0133-.9164 7-6 7-10v-1.41968c0-.35886-.1923-.6902-.5039-.86824zm-.49614 1.216495-5.75 3.28571v1.2746c0 1.71749.65238 3.7522 1.78726 5.46629 1.07287 1.6204 2.47498 2.8062 3.96274 3.2425 1.48776-.4363 2.8899-1.6221 3.9627-3.2425 1.1349-1.71409 1.7873-3.7488 1.7873-5.46629v-1.2746z" fill-rule="evenodd" /> + </g> + <g id="safer_icon" stroke="none" stroke-width="1"> + <path clip-rule="evenodd" d="m8.49614.283505c-.30743-.175675-.68485-.175675-.99228.000001l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 4.0133-.9164 7-6 7-10v-1.41968c0-.35886-.1923-.6902-.5039-.86824zm-.49614 1.216495-5.75 3.28571v1.2746c0 1.71749.65238 3.7522 1.78726 5.46629 1.07287 1.6204 2.47498 2.8062 3.96274 3.2425 1.48776-.4363 2.8899-1.6221 3.9627-3.2425 1.1349-1.71409 1.7873-3.7488 1.7873-5.46629v-1.2746z" fill-rule="evenodd"/> + <path d="m3.5 6.12062v-.40411c0-.08972.04807-.17255.12597-.21706l4-2.28572c.16666-.09523.37403.02511.37403.21707v10.0766c-1.01204-.408-2.054-1.3018-2.92048-2.6105-1.02134-1.54265-1.57952-3.34117-1.57952-4.77628z"/> + </g> + <g id="safest_icon" stroke="none" stroke-width="1"> + <path clip-rule="evenodd" d="m8.49614.283505c-.30743-.175675-.68485-.175675-.99228.000001l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 4.0133-.9164 7-6 7-10v-1.41968c0-.35886-.1923-.6902-.5039-.86824zm-.49614 1.216495-5.75 3.28571v1.2746c0 1.71749.65238 3.7522 1.78726 5.46629 1.07287 1.6204 2.47498 2.8062 3.96274 3.2425 1.48776-.4363 2.8899-1.6221 3.9627-3.2425 1.1349-1.71409 1.7873-3.7488 1.7873-5.46629v-1.2746z" fill-rule="evenodd"/> + <path d="m3.5 6.12062v-.40411c0-.08972.04807-.17255.12597-.21706l4.25-2.42857c.07685-.04392.17121-.04392.24806 0l4.24997 2.42857c.0779.04451.126.12734.126.21706v.40411c0 1.43511-.5582 3.23363-1.5795 4.77628-.8665 1.3087-1.90846 2.2025-2.9205 2.6105-1.01204-.408-2.054-1.3018-2.92048-2.6105-1.02134-1.54265-1.57952-3.34117-1.57952-4.77628z"/> + </g> + <g id="standard_custom_icon" stroke="none" stroke-width="1"> + <path d="m9.37255.784312-.87641-.500806c-.30743-.175676-.68485-.175676-.99228 0l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 3.7599-.8585 6.6186-5.3745 6.9647-9.23043-.4008.20936-.8392.35666-1.3024.42914-.2132 1.43414-.8072 2.98009-1.6996 4.32789-1.0728 1.6204-2.47494 2.8062-3.9627 3.2425-1.48776-.4363-2.88987-1.6221-3.96274-3.2425-1.13488-1.71409-1.78726-3.7488-1.78726-5.46629v-1.2746l5.75-3.28571.86913.49664c.10502-.43392.27664-.84184.50342-1.212328z"/> + <circle cx="13" cy="3" fill="#ffbd2e" r="3"/> + </g> + <g id="safer_custom_icon" stroke="none" stroke-width="1"> + <path d="m9.37255.784312-.87641-.500806c-.30743-.175676-.68485-.175676-.99228 0l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 3.7599-.8585 6.6186-5.3745 6.9647-9.23043-.4008.20936-.8392.35666-1.3024.42914-.2132 1.43414-.8072 2.98009-1.6996 4.32789-1.0728 1.6204-2.47494 2.8062-3.9627 3.2425-1.48776-.4363-2.88987-1.6221-3.96274-3.2425-1.13488-1.71409-1.78726-3.7488-1.78726-5.46629v-1.2746l5.75-3.28571.86913.49664c.10502-.43392.27664-.84184.50342-1.212328z"/> + <path d="m3.5 6.12062v-.40411c0-.08972.04807-.17255.12597-.21706l4-2.28572c.16666-.09523.37403.02511.37403.21707v10.0766c-1.01204-.408-2.054-1.3018-2.92048-2.6105-1.02134-1.54265-1.57952-3.34117-1.57952-4.77628z"/> + <circle cx="13" cy="3" fill="#ffbd2e" r="3"/> + </g> + <g id="safest_custom_icon" stroke="none" stroke-width="1"> + <path d="m9.37255.784312-.87641-.500806c-.30743-.175676-.68485-.175676-.99228 0l-6 3.428574c-.31157.17804-.50386.50938-.50386.86824v1.41968c0 4 2.98667 9.0836 7 10 3.7599-.8585 6.6186-5.3745 6.9647-9.23043-.4008.20936-.8392.35666-1.3024.42914-.2132 1.43414-.8072 2.98009-1.6996 4.32789-1.0728 1.6204-2.47494 2.8062-3.9627 3.2425-1.48776-.4363-2.88987-1.6221-3.96274-3.2425-1.13488-1.71409-1.78726-3.7488-1.78726-5.46629v-1.2746l5.75-3.28571.86913.49664c.10502-.43392.27664-.84184.50342-1.212328z"/> + <path d="m8.77266 3.44151-.64863-.37064c-.07685-.04392-.17121-.04392-.24806 0l-4.25 2.42857c-.0779.04451-.12597.12735-.12597.21706v.40412c0 1.4351.55818 3.23362 1.57952 4.77618.86648 1.3087 1.90844 2.2026 2.92048 2.6106 1.01204-.408 2.054-1.3018 2.9205-2.6106.7761-1.17217 1.2847-2.49215 1.4843-3.68816-1.9219-.26934-3.43158-1.82403-3.63214-3.76713z"/> + <circle cx="13" cy="3" fill="#ffbd2e" r="3"/> + </g> + </defs> + <use id="standard" fill="context-fill" fill-opacity="context-fill-opacity" href="#standard_icon" /> + <use id="safer" fill="context-fill" fill-opacity="context-fill-opacity" href="#safer_icon" /> + <use id="safest" fill="context-fill" fill-opacity="context-fill-opacity" href="#safest_icon" /> + <use id="standard_custom" fill="context-fill" fill-opacity="context-fill-opacity" href="#standard_custom_icon" /> + <use id="safer_custom" fill="context-fill" fill-opacity="context-fill-opacity" href="#safer_custom_icon" /> + <use id="safest_custom" fill="context-fill" fill-opacity="context-fill-opacity" href="#safest_custom_icon" /> +</svg> diff --git a/browser/components/securitylevel/content/securityLevelPanel.css b/browser/components/securitylevel/content/securityLevelPanel.css index 70022e2bd4b2..6462c02f1594 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.css +++ b/browser/components/securitylevel/content/securityLevelPanel.css @@ -1,82 +1,74 @@ /* Security Level CSS */ -panel#securityLevel-panel > .panel-arrowcontainer > .panel-arrowcontent { - padding: 0; -} - panelview#securityLevel-panelview { - width: 20em; + width: 25em; } -panelview#securityLevel-panelview>vbox.panel-subview-body { - padding: 1em; +vbox#securityLevel-vbox > vbox { + background-repeat: no-repeat; + /* icon center-line should be in-line with right margin */ + /* -margin + panelWidth - imageWidth/2 */ + background-position: calc(-16px + 25em - 4.5em) 0.4em; + background-size: 9em 9em; + -moz-context-properties: fill, fill-opacity; + fill-opacity: 1; + fill: var(--button-bgcolor); + min-height: 10em; } -label#securityLevel-header { - text-transform: uppercase; - color: var(--panel-disabled-color); - font-size: 0.85em; - margin: 0 0 0.4em 0; - padding: 0; +vbox#securityLevel-vbox > vbox[level="standard"] { + background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#standard"); } - -hbox#securityLevel-levelHbox { - margin-bottom: 1em; +vbox#securityLevel-vbox > vbox[level="safer"] { + background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safer"); +} +vbox#securityLevel-vbox > vbox[level="safest"] { + background-image: url("chrome://browser/content/securitylevel/securityLevelIcon.svg#safest"); } -label#securityLevel-level { - font-size: 1.5em; - margin: 0 0.5em 0 0; - padding: 0; +vbox#securityLevel-vbox > toolbarseparator { + margin-inline: 16px; } -label#securityLevel-customWarning { - border-radius: 2px; - background-color: #ffe845; - text-transform: uppercase; - font-weight: bolder; - font-size: 0.8em; - height: 1em; - line-height: 1em; - vertical-align: middle; - margin: auto; - padding: 0.4em; +vbox#securityLevel-vbox > vbox { + margin-inline: 0; + padding-inline: 16px; } -panelview#securityLevel-panelview description { - margin: 0 -0.5em 0.5em 0; - padding: 0 !important; +vbox#securityLevel-vbox > vbox * { + margin-inline: 0; } -label#securityLevel-learnMore { - margin: 0 0 1.0em 0; - padding: 0; +vbox#securityLevel-vbox > vbox > hbox { } -panelview#securityLevel-panelview button { - -moz-appearance: none; - background-color: var(--arrowpanel-dimmed); +label#securityLevel-level { + font-size: 1.25em; + font-weight: 600; + padding-top: 0.15em; } -panelview#securityLevel-panelview button:hover { - background-color: var(--arrowpanel-dimmed-further); +label#securityLevel-custom { + border-radius: 4px; + background-color: var(--yellow-50); + color: black; + font-size: 1em; + height: 1.6em; + line-height: 1.0em; + padding: 0.4em 0.5em; + margin-left: 1em!important; } -panelview#securityLevel-panelview button:active { - background-color: var(--arrowpanel-dimmed-even-further); +description#securityLevel-summary { + margin-top: 1em; + padding-right: 5em; } -button#securityLevel-restoreDefaults { - margin: 0 0 1.0em 0; - padding: 0.45em; - color: inherit !important; +vbox#securityLevel-vbox > hbox.panel-footer { + display: flex; } + button#securityLevel-advancedSecuritySettings { - margin: 0 -1.0em -1.0em -1.0em; - border-radius: 0; - border-top: 1px solid var(--panel-separator-color); - padding: 0; - height: 3.0em; - color: inherit !important; + margin-block: 0; } diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index 4abbb12dd856..02d93b738ff5 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -1,37 +1,46 @@ <panel id="securityLevel-panel" - role="group" - type="arrow" - orient="vertical" - level="top" - hidden="true" - class="panel-no-padding" - onpopupshown="SecurityLevelPanel.onPopupShown(event);" - onpopuphidden="SecurityLevelPanel.onPopupHidden(event);" - > + role="group" + type="arrow" + orient="vertical" + level="top" + hidden="true" + class="panel-no-padding" + onpopupshown="SecurityLevelPanel.onPopupShown(event);" + onpopuphidden="SecurityLevelPanel.onPopupHidden(event);"> <panelmultiview mainViewId="securityLevel-panelview"> <panelview id="securityLevel-panelview" descriptionheightworkaround="true"> - <vbox class="panel-subview-body"> - <label id="securityLevel-header"/> - <hbox id="securityLevel-levelHbox"> - <label id="securityLevel-level"/> - <vbox> + <vbox id="securityLevel-vbox"> + <box class="panel-header"> + <html:h1 id="securityLevel-header"/> + </box> + <toolbarseparator></toolbarseparator> + <vbox> + <hbox> + <label id="securityLevel-level"/> + <vbox> + <spacer flex="1"/> + <label id="securityLevel-custom"/> + <spacer flex="1"/> + </vbox> <spacer flex="1"/> - <label id="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> + </hbox> + <description id="securityLevel-summary"/> + <hbox> + <label + id="securityLevel-learnMore" + class="learnMore text-link" + onclick="SecurityLevelPanel.hide();" + is="text-link"/> + <spacer/> + </hbox> + </vbox> + <hbox class="panel-footer"> + <button id="securityLevel-restoreDefaults" + oncommand="SecurityLevelPanel.restoreDefaults();"/> + <button id="securityLevel-advancedSecuritySettings" + default="true" + oncommand="SecurityLevelPanel.openAdvancedSecuritySettings();"/> </hbox> - <description id="securityLevel-summary"/> - <label - id="securityLevel-learnMore" - class="learnMore text-link" - onclick="SecurityLevelPanel.hide();" - is="text-link"/> - <button - id="securityLevel-restoreDefaults" - oncommand="SecurityLevelPanel.restoreDefaults();"/> - <button - id="securityLevel-advancedSecuritySettings" - oncommand="SecurityLevelPanel.openAdvancedSecuritySettings();"/> </vbox> </panelview> </panelmultiview> diff --git a/browser/components/securitylevel/content/securityLevelPreferences.css b/browser/components/securitylevel/content/securityLevelPreferences.css index 0d1040d177d8..b0c87d84a259 100644 --- a/browser/components/securitylevel/content/securityLevelPreferences.css +++ b/browser/components/securitylevel/content/securityLevelPreferences.css @@ -1,12 +1,10 @@ label#securityLevel-customWarning { - border-radius: 2px; - background-color: #ffe845; - text-transform: uppercase; - font-weight: bolder; - font-size: 0.7em; - height: 1em; - line-height: 1em; - padding: 0.35em; + border-radius: 4px; + background-color: var(--yellow-50); + color: black; + font-size: 1em; + height: 1.6em; + padding: 0.4em 0.5em; } radiogroup#securityLevel-radiogroup radio { diff --git a/browser/components/securitylevel/jar.mn b/browser/components/securitylevel/jar.mn index 9ac408083fbc..61aa4169f9ec 100644 --- a/browser/components/securitylevel/jar.mn +++ b/browser/components/securitylevel/jar.mn @@ -3,4 +3,4 @@ browser.jar: content/browser/securitylevel/securityLevelPanel.css (content/securityLevelPanel.css) content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) - content/browser/securitylevel/securityLevelButton.svg (content/securityLevelButton.svg) + content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index c0691ff078ce..73671c08693d 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -230,6 +230,10 @@ var TorStrings = { "advanced_security_settings", "Advanced Security Settings\u2026" ), + change: getString( + "change", + "Change\u2026" + ), }; return retval; })() /* Security Level Strings */, diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index e1d64c707518..abecf34cdb92 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -1430,7 +1430,8 @@ menuitem.panel-subview-footer@menuStateActive@, #editBookmarkPanel toolbarseparator, #downloadsPanel-mainView toolbarseparator, .cui-widget-panelview menuseparator, -.cui-widget-panel toolbarseparator { +.cui-widget-panel toolbarseparator, +#securityLevel-panel toolbarseparator { appearance: none; min-height: 0; border-top: 1px solid var(--panel-separator-color);

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] Adding issue template for bugs.
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 39a21f3f5c59624a0feed1bdd5f5d878fba1a2aa Author: Gaba <gaba(a)torproject.org> Date: Mon Jun 28 11:44:16 2021 -0700 Adding issue template for bugs. --- .gitlab/issue_templates/UXBug.md | 29 +++++++++++++++++++++++++++++ .gitlab/issue_templates/bug.md | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/.gitlab/issue_templates/UXBug.md b/.gitlab/issue_templates/UXBug.md new file mode 100644 index 000000000000..8e7cb2a5e163 --- /dev/null +++ b/.gitlab/issue_templates/UXBug.md @@ -0,0 +1,29 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +## Relevant logs and/or screenshots +**Do you have screenshots? Attach them to this ticket please.** + +/label ~tor-ux ~needs-investigation ~bug +/assign @nah diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md new file mode 100644 index 000000000000..6ce85a4864be --- /dev/null +++ b/.gitlab/issue_templates/bug.md @@ -0,0 +1,32 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +### Environment +**Which operating system are you using? For example: Debian GNU/Linux 10.1, Windows 10, Ubuntu Xenial, FreeBSD 12.2, etc.** +**Which installation method did you use? Distribution package (apt, pkg, homebrew), from source tarball, from Git, etc.** + +### Relevant logs and/or screenshots + + +/label ~bug

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27511: Add new identity button to toolbar
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 44366fa77489aef77fc739942db3697408e2e868 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 17 12:14:05 2021 -0500 fixup! Bug 27511: Add new identity button to toolbar --- browser/themes/shared/icons/new_circuit.svg | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/themes/shared/icons/new_circuit.svg b/browser/themes/shared/icons/new_circuit.svg index e0a93cc83502..ddc819946818 100644 --- a/browser/themes/shared/icons/new_circuit.svg +++ b/browser/themes/shared/icons/new_circuit.svg @@ -1,8 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?> <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <title>Icon / New Circuit(a)1.5x</title> - <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> - <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <g stroke="none" stroke-width="1" fill="context-fill" fill-rule="evenodd" opacity="context-fill-opacity"> + <path d="m10.707 6h3.993l.3-.3v-3.993c.0002-.09902-.0291-.19586-.084-.27825s-.1331-.14661-.2245-.18453c-.0915-.03792-.1922-.04782-.2893-.02845-.0971.01936-.1863.06713-.2562.13723l-1.459 1.459c-1.2817-1.16743-2.95335-1.813714-4.687-1.812-3.859 0-7 3.141-7 7s3.141 7 7 7c1.74123.007 3.422-.6379 4.7116-1.8079 1.2896-1.1701 2.0945-2.7804 2.2564-4.5141.0156-.1649-.0348-.32927-.1401-.4571s-.2571-.2087-.4219-.2249c-.1644-.01324-.3275.03801-.4548.1429s-.2088.2552-.2272.4191c-.1334 1.42392-.7948 2.7464-1.854 3.7072-1.0593.9609-2.43986 1.4905-3.87 1.4848-3.171 0-5.75-2.579-5.75-5.75s2.579-5.75 5.75-5.75c1.40277-.00207 2.7572.5123 3.805 1.445l-1.451 1.451c-.07.06987-.1178.15895-.1372.25597-.0194.09701-.0096.1976.0282.28903.0378.09144.1019.1696.1841.22461.0823.055.179.08437.2779.08439z"/> + <path d="m8 12.5c-2.48528 0-4.5-2.0147-4.5-4.5 0-2.48528 2.01472-4.5 4.5-4.5z"/> </g> </svg>

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27477: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 67e4e06d45d415c815f6b7c45d6a22b92379c384 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:25 2021 +0000 fixup! Bug 27477: Implement about:torconnect captive portal within Tor Browser This reverts commit ff3b679987ee9d5515508d94d78ed28166706249. --- .../components/torpreferences/content/torPane.js | 9 +++++---- browser/modules/TorConnect.jsm | 23 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index cde424a3f32a..afdb27351831 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -159,10 +159,11 @@ const gTorPane = (function() { this._messageBoxButton = prefpane.querySelector(selectors.messageBox.button); // wire up connect button this._messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap(); - let win = Services.wm.getMostRecentWindow("navigator:browser"); - // switch to existing about:torconnect tab or create a new one - win.switchToTabHavingURI("about:torconnect", true); + TorConnect.beginBootstrap().then((result) => { + let win = Services.wm.getMostRecentWindow("navigator:browser"); + // switch to existing about:torconnect tab or create a new one + win.switchToTabHavingURI("about:torconnect", true); + }); }); let populateMessagebox = () => { diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 17a786dc31f0..6444ab39e928 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -167,19 +167,19 @@ const TorConnect = (() => { /* Initial is never transitioned to */ [TorConnectState.Initial, null], /* Configuring */ - [TorConnectState.Configuring, (self, prevState) => { + [TorConnectState.Configuring, async (self, prevState) => { // TODO move this to the transition function if (prevState === TorConnectState.Bootstrapping) { - TorProtocolService.torStopBootstrap(); + await TorProtocolService.torStopBootstrap(); } }], /* AutoConfiguring */ - [TorConnectState.AutoConfiguring, (self, prevState) => { + [TorConnectState.AutoConfiguring, async (self, prevState) => { }], /* Bootstrapping */ - [TorConnectState.Bootstrapping, (self, prevState) => { - let error = TorProtocolService.connect(); + [TorConnectState.Bootstrapping, async (self, prevState) => { + let error = await TorProtocolService.connect(); if (error) { self.onError(error.message, error.details); } else { @@ -187,12 +187,12 @@ const TorConnect = (() => { } }], /* Bootstrapped */ - [TorConnectState.Bootstrapped, (self,prevState) => { + [TorConnectState.Bootstrapped, async (self,prevState) => { // notify observers of bootstrap completion Services.obs.notifyObservers(null, TorConnectTopics.BootstrapComplete); }], /* Error */ - [TorConnectState.Error, (self, prevState, errorMessage, errorDetails, fatal) => { + [TorConnectState.Error, async (self, prevState, errorMessage, errorDetails, fatal) => { self._errorMessage = errorMessage; self._errorDetails = errorDetails; @@ -204,7 +204,7 @@ const TorConnect = (() => { } }], /* FatalError */ - [TorConnectState.FatalError, (self, prevState) => { + [TorConnectState.FatalError, async (self, prevState) => { Services.obs.notifyObservers(null, TorConnectTopics.FatalError); }], /* Disabled */ @@ -213,7 +213,7 @@ const TorConnect = (() => { }], ])), - _changeState: function(newState, ...args) { + _changeState: async function(newState, ...args) { const prevState = this._state; // ensure this is a valid state transition @@ -228,7 +228,7 @@ const TorConnect = (() => { this._state = newState; // call our transition function and forward any args - this._transitionCallbacks.get(newState)(this, prevState, ...args); + await this._transitionCallbacks.get(newState)(this, prevState, ...args); Services.obs.notifyObservers({state: newState}, TorConnectTopics.StateChange); }, @@ -306,8 +306,7 @@ const TorConnect = (() => { /* Handle bootstrap error*/ case TorTopics.BootstrapError: { const obj = subject?.wrappedJSObject; - TorProtocolService.torStopBootstrap(); - this.onError(obj.message, obj.details); + TorProtocolService.torStopBootstrap().then(() => this.onError(obj.message, obj.details)); break; } case TorTopics.LogHasWarnOrErr: {

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 2304d0433d59489b3223bc442dbef718974378df Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 17 14:01:26 2021 -0500 fixup! Bug 23247: Communicating security expectations for .onion --- .../themes/shared/identity-block/identity-block.inc.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index 283fc2113e2f..90fb46169bb0 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -212,21 +212,21 @@ toolbar[brighttext] #identity-box[pageproxystate="valid"].chromeUI #identity-ico list-style-image: url(chrome://global/skin/icons/security-broken.svg); } -#identity-box[pageproxystate="valid"].onionUnknownIdentity > #identity-icon, -#identity-box[pageproxystate="valid"].onionVerifiedDomain > #identity-icon, -#identity-box[pageproxystate="valid"].onionMixedActiveBlocked > #identity-icon { +#identity-box[pageproxystate="valid"].onionUnknownIdentity #identity-icon, +#identity-box[pageproxystate="valid"].onionVerifiedDomain #identity-icon, +#identity-box[pageproxystate="valid"].onionMixedActiveBlocked #identity-icon { list-style-image: url(chrome://browser/skin/onion.svg); visibility: visible; } -#identity-box[pageproxystate="valid"].onionMixedDisplayContent > #identity-icon, -#identity-box[pageproxystate="valid"].onionMixedDisplayContentLoadedActiveBlocked > #identity-icon, -#identity-box[pageproxystate="valid"].onionCertUserOverridden > #identity-icon { +#identity-box[pageproxystate="valid"].onionMixedDisplayContent #identity-icon, +#identity-box[pageproxystate="valid"].onionMixedDisplayContentLoadedActiveBlocked #identity-icon, +#identity-box[pageproxystate="valid"].onionCertUserOverridden #identity-icon { list-style-image: url(chrome://browser/skin/onion-warning.svg); visibility: visible; } -#identity-box[pageproxystate="valid"].onionMixedActiveContent > #identity-icon { +#identity-box[pageproxystate="valid"].onionMixedActiveContent #identity-icon { list-style-image: url(chrome://browser/skin/onion-slash.svg); visibility: visible; }

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit b5c9e24501057382337dc9276af616e495523e9d Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Sep 20 15:54:39 2021 -0500 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- .../controlcenter/content/identityPanel.inc.xhtml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index 0735661e274c..06511866ae29 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -93,21 +93,26 @@ </hbox>  - <hbox id="circuit-display-container" class="identity-popup-section"> - <vbox id="circuit-display-content" flex="1" role="group" + + <vbox id="circuit-display-container" class="identity-popup-section"> + <toolbarseparator/> + <vbox id="circuit-display-header" flex="1" role="group" aria-labelledby="circuit-display-headline"> - <hbox id="circuit-display-header" align="center"> + <hbox flex="1"> <label id="circuit-display-headline" role="heading" aria-level="2">&torbutton.circuit_display.title;</label> </hbox> - <html:ul id="circuit-display-nodes" dir="auto"/> </vbox> - <vbox id="circuit-reload-content" flex="1"> - <html:button id="circuit-reload-button" - onclick="torbutton_new_circuit()">&torbutton.circuit_display.new_circuit;</html:button> + <vbox id="circuit-display-content"> + <html:ul id="circuit-display-nodes" dir="auto"/> <hbox id="circuit-guard-note-container"/> + <hbox id="circuit-reload-button-container"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()" + default="true">&torbutton.circuit_display.new_circuit;</html:button> + </hbox> </vbox> - </hbox> + </vbox>  <vbox hidden="true"

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit f2584ebad73ada6b4b570ada7401e2d3b127a2ce Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:23 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser This reverts commit 563c8779fef936a8bb5454578765843187be396b. --- browser/modules/TorConnect.jsm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 2f947374797a..17a786dc31f0 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -472,7 +472,9 @@ const TorConnect = (() => { // will attempt to convert user-supplied string to a uri, fallback to about:tor if cannot convert // to valid uri object let uriStringToUri = (uriString) => { - let uri = Services.uriFixup.createFixupURI(uriString, 0); + const fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_NONE; + let uri = Services.uriFixup.getFixupURIInfo(uriString, fixupFlags) + .preferredURI; return uri ? uri : Services.io.newURI("about:tor"); }; let uris = uriStrings.map(uriStringToUri);

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit c1843e4e494aa810be1a605edac827c766b8809a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 29 15:42:41 2021 +0000 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/urlbar/UrlbarInput.jsm | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index a118a6f76c19..bab9bf1ad2b7 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -32,6 +32,7 @@ function maybeUpdateOpenLocationForTorConnect(openUILinkWhere, currentURI, desti } catch (e) { // swallow exception and fall through returning original so we don't accidentally break // anything if an exception is thrown + console.log(e? e.message : e); } return openUILinkWhere;

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit 74591f4b96daf7ccafbd291f795e46e39036bf85 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 03:52:21 2021 +0000 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor This reverts commit 84aa0573fb072665688c669b98032c3c561ee123. --- browser/components/torpreferences/content/torPane.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 6dbc6b3c0e91..cde424a3f32a 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -699,7 +699,6 @@ const gTorPane = (function() { case TorBridgeSource.BuiltIn: { // if there is a built-in bridge already selected, use that let bridgeType = this._builtinBridgeMenulist.value; - console.log(`bridge type: ${bridgeType}`); if (bridgeType) { TorSettings.bridges.enabled = true; TorSettings.bridges.source = TorBridgeSource.BuiltIn;

1 0

[tor-browser/tor-browser-91.2.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 06 Oct '21

06 Oct '21

commit d4b6078699c350ad6e2c1a94b985b0b170637ece Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Sep 14 15:07:30 2021 -0500 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torconnect/content/aboutTorConnect.css | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 3bdc6ff22192..e5e0d7accac2 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -29,21 +29,25 @@ input[type="checkbox"]:not(:disabled):hover { border-color: var(--purple-70); } -/* fix checkbox visibility when dark mode enabled */ -input[type="checkbox"]:checked { - fill: var(--in-content-page-color); +#connectButton, +input[type="checkbox"]:not(:disabled) { + background-color: var(--purple-60)!important; + color: white; + fill: white; } -#connectButton { - background-color: var(--purple-60); -} - -#connectButton:hover { - background-color: var(--purple-70); +#connectButton:hover, +input[type="checkbox"]:not(:disabled):hover { + background-color: var(--purple-70)!important; + color: white; + fill: white; } -#connectButton:active { - background-color: var(--purple-80); +#connectButton:active, +input[type="checkbox"]:not(:disabled):active { + background-color: var(--purple-80)!important; + color: white; + fill: white; } #progressBackground {

1 0