morgan pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

3 changed files:

Changes:

  • browser/components/securitylevel/content/securityLevel.js
    ... ... @@ -195,7 +195,6 @@ var SecurityLevelPanel = {
    195 195
    196 196 
       _configUIFromPrefs() {
    197 197 
         if (!this._populated) {
    198 
    -      console.warn("_configUIFromPrefs before XUL was populated.");
    199 198 
           return;
    200 199 
         }
    201 200
    ... ... @@ -353,10 +352,7 @@ var SecurityLevelPreferences = {
    353 352 
         // Have the container's selection CSS class match the selection state of the
    354 353 
         // radio elements.
    355 354 
         for (const { container, radio } of this._radioOptions) {
    356 
    -      container.classList.toggle(
    357 
    -        "securityLevel-radio-option-selected",
    358 
    -        radio.selected
    359 
    -      );
    355 
    +      container.classList.toggle("selected", radio.selected);
    360 356 
         }
    361 357 
       },
    362 358

  • browser/components/securitylevel/content/securityLevelPreferences.css
    ... ... @@ -15,44 +15,12 @@
    15 15 
       font-weight: bold;
    16 16 
     }
    17 17
    18 
    -/* Overwrite indent rule from preferences.css */
    19 
    -#securityLevel-radiogroup description.indent {
    20 
    -  color: var(--in-content-page-color);
    21 
    -}
    22 
    -
    23 
    -#securityLevel-radiogroup radio {
    24 
    -  font-weight: bold;
    25 
    -}
    26 
    -
    27 18 
     #securityLevel-radiogroup[disabled] {
    28 19 
       opacity: 0.5;
    29 20 
     }
    30 21
    31 22 
     /* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall
    32 23 
      * on the radio text. */
    33 
    -#securityLevel-radiogroup[disabled] radio[disabled] {
    24 
    +#securityLevel-radiogroup[disabled] radio[disabled] .radio-label-box {
    34 25 
       opacity: 1.0;
    35 26 
     }
    36 
    -
    37 
    -.securityLevel-radio-option {
    38 
    -  border: 1px solid var(--in-content-box-border-color);
    39 
    -  border-radius: 4px;
    40 
    -  margin: 3px 0;
    41 
    -  padding: 9px;
    42 
    -}
    43 
    -
    44 
    -.securityLevel-radio-option.securityLevel-radio-option-selected {
    45 
    -  background-color: var(--section-highlight-background-color);
    46 
    -  border: 1px solid var(--in-content-accent-color);
    47 
    -
    48 
    -}
    49 
    -
    50 
    -.securityLevel-radio-option:not(
    51 
    -  .securityLevel-radio-option-selected
    52 
    -) .securityLevel-descriptionList {
    53 
    -  display: none;
    54 
    -}
    55 
    -
    56 
    -.securityLevel-descriptionList description {
    57 
    -  display: list-item;
    58 
    -}

  • browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml
    ... ... @@ -45,78 +45,82 @@
    45 45 
           </hbox>
    46 46 
         </hbox>
    47 47 
         <radiogroup id="securityLevel-radiogroup">
    48 
    -      <vbox class="securityLevel-radio-option">
    48 
    +      <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container">
    49 49 
             <radio
    50 50 
               value="standard"
    51 51 
               data-l10n-id="security-level-preferences-level-standard"
    52 52 
               aria-describedby="securityLevelSummary-standard"
    53 53 
             />
    54 
    -        <vbox id="securityLevelSummary-standard">
    55 
    -          <description
    56 
    -            class="summary indent"
    57 
    -            flex="1"
    58 
    -            data-l10n-id="security-level-summary-standard"
    59 
    -          />
    54 
    +        <vbox id="securityLevelSummary-standard" class="indent">
    55 
    +          <label data-l10n-id="security-level-summary-standard" />
    60 56 
             </vbox>
    61 57 
           </vbox>
    62 
    -      <vbox class="securityLevel-radio-option">
    58 
    +      <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container">
    63 59 
             <!-- NOTE: We point the accessible description to the wrapping vbox
    64 60 
               - rather than its first description element. This means that when the
    65 
    -          - securityLevel-descriptionList is shown or hidden, its text content
    66 
    -          - is included or excluded from the accessible description,
    67 
    -          - respectively. -->
    61 
    +          - privacy-extra-information is shown or hidden, its text content is
    62 
    +          - included or excluded from the accessible description, respectively.
    63 
    +          -->
    68 64 
             <radio
    69 65 
               value="safer"
    70 66 
               data-l10n-id="security-level-preferences-level-safer"
    71 67 
               aria-describedby="securityLevelSummary-safer"
    72 68 
             />
    73 
    -        <vbox id="securityLevelSummary-safer">
    74 
    -          <description
    75 
    -            class="summary indent"
    76 
    -            flex="1"
    77 
    -            data-l10n-id="security-level-summary-safer"
    78 
    -          />
    79 
    -          <vbox class="securityLevel-descriptionList indent">
    80 
    -            <description
    81 
    -              class="indent"
    82 
    -              data-l10n-id="security-level-preferences-bullet-https-only-javascript"
    83 
    -            />
    84 
    -            <description
    85 
    -              class="indent"
    86 
    -              data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols"
    87 
    -            />
    88 
    -            <description
    89 
    -              class="indent"
    90 
    -              data-l10n-id="security-level-preferences-bullet-limit-media"
    91 
    -            />
    69 
    +        <vbox id="securityLevelSummary-safer" class="indent">
    70 
    +          <label data-l10n-id="security-level-summary-safer" />
    71 
    +          <vbox class="privacy-extra-information">
    72 
    +            <vbox class="indent">
    73 
    +              <hbox class="extra-information-label">
    74 
    +                <label
    75 
    +                  class="content-blocking-label"
    76 
    +                  data-l10n-id="security-level-preferences-bullet-https-only-javascript"
    77 
    +                />
    78 
    +              </hbox>
    79 
    +              <hbox class="extra-information-label">
    80 
    +                <label
    81 
    +                  class="content-blocking-label"
    82 
    +                  data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols"
    83 
    +                />
    84 
    +              </hbox>
    85 
    +              <hbox class="extra-information-label">
    86 
    +                <label
    87 
    +                  class="content-blocking-label"
    88 
    +                  data-l10n-id="security-level-preferences-bullet-limit-media"
    89 
    +                />
    90 
    +              </hbox>
    91 
    +            </vbox>
    92 92 
               </vbox>
    93 93 
             </vbox>
    94 94 
           </vbox>
    95 
    -      <vbox class="securityLevel-radio-option">
    95 
    +      <vbox class="securityLevel-radio-option privacy-detailedoption info-box-container">
    96 96 
             <radio
    97 97 
               value="safest"
    98 98 
               data-l10n-id="security-level-preferences-level-safest"
    99 99 
               aria-describedby="securityLevelSummary-safest"
    100 100 
             />
    101 
    -        <vbox id="securityLevelSummary-safest">
    102 
    -          <description
    103 
    -            class="summary indent"
    104 
    -            flex="1"
    105 
    -            data-l10n-id="security-level-summary-safest"
    106 
    -          />
    107 
    -          <vbox class="securityLevel-descriptionList indent">
    108 
    -            <description
    109 
    -              class="indent"
    110 
    -              data-l10n-id="security-level-preferences-bullet-disabled-javascript"
    111 
    -            />
    112 
    -            <description
    113 
    -              class="indent"
    114 
    -              data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols-and-images"
    115 
    -            />
    116 
    -            <description
    117 
    -              class="indent"
    118 
    -              data-l10n-id="security-level-preferences-bullet-limit-media"
    119 
    -            />
    101 
    +        <vbox id="securityLevelSummary-safest" class="indent">
    102 
    +          <label data-l10n-id="security-level-summary-safest" />
    103 
    +          <vbox class="privacy-extra-information">
    104 
    +            <vbox class="indent">
    105 
    +              <hbox class="extra-information-label">
    106 
    +                <label
    107 
    +                  class="content-blocking-label"
    108 
    +                  data-l10n-id="security-level-preferences-bullet-disabled-javascript"
    109 
    +                />
    110 
    +              </hbox>
    111 
    +              <hbox class="extra-information-label">
    112 
    +                <label
    113 
    +                  class="content-blocking-label"
    114 
    +                  data-l10n-id="security-level-preferences-bullet-limit-font-and-symbols-and-images"
    115 
    +                />
    116 
    +              </hbox>
    117 
    +              <hbox class="extra-information-label">
    118 
    +                <label
    119 
    +                  class="content-blocking-label"
    120 
    +                  data-l10n-id="security-level-preferences-bullet-limit-media"
    121 
    +                />
    122 
    +              </hbox>
    123 
    +            </vbox>
    120 124 
               </vbox>
    121 125 
             </vbox>
    122 126 
           </vbox>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help