Skip to content

Adjust line spacing in our preferences

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, richard
    • security : jwilde, ma1
    • signing : boklm, richard
    • updater : pierov
    • windows : jwilde, richard
    • misc/other : pierov, richard

Change Description

Only "fixup! Bug 40925: Implemented the Security Level component" should also be cherry-picked to the base-browser branch.

We adjust some of our settings in response to mozilla removing the line-height: 1.8 rule from preferences in ESR 128.

/cc @donuts since I made slightly more adjustments than recommended in #42705 (comment 3046433).

Security level
  • Adopt the same markup as "Enhanced Tracking Protection" and "DNS over HTTPS".
  • Update the radio disabled opacity rule following bugzilla bug 1869233. Applies when user has a custom security level.
  • Dropped a console warning that triggered if you change the security level before opening the security level panel.

Screenshot of security level preferences with new styling

Bridge settings
  • Removed our own line-height: 1.8 rule to match upstream.
  • Added a vertical 8px gap between the built-in type heading and description.
  • Added a vertical 4px gap between the "Help others connect" heading and the content. Most obviously needed when the description text spans two lines.
  • Added a vertical 8px gap between the tor bridge provider options, and 8px gap between the provider name and instructions.
  • Vertically center-aligned the "Request bridges" box content.

Screenshot of bridge preferences with user provided bridges

Screenshot of bridge preferences with built-in bridges

How Tested

  1. Switching security levels.
  2. Custom security level should show the radio group as greyed-out.
  3. Checked spacing with built-in bridges.
  4. Checked spacing with user bridges.

Merge request reports