morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes:

  • browser/components/torpreferences/content/torPreferences.css
    ... ... @@ -20,7 +20,10 @@ button.spoof-button-disabled {
    20 20 
       width: 16px;
    21 21 
       height: 16px;
    22 22 
       -moz-context-properties: fill;
    23 
    -  fill: var(--tor-accent-color);
    23 
    +  /* Use --tor-text-color. This will have good contrast for this small icon
    24 
    +   * against the background. And it will match the surrounding text for high
    25 
    +   * contrast and forced colour themes. */
    26 
    +  fill: var(--tor-text-color);
    24 27 
       content: url("chrome://global/skin/icons/loading.svg");
    25 28 
     }
    26 29
    ... ... @@ -168,7 +171,7 @@ button.spoof-button-disabled {
    168 171 
        * using it for text colors, so we only enable these rules when not using a
    169 172 
        * high contrast theme or forced colors. */
    170 173 
       .bridge-status-badge.bridge-status-connected {
    171 
    -    color: var(--tor-accent-color);
    174 
    +    color: var(--tor-text-color);
    172 175 
       }
    173 176
    174 177 
       .bridge-status-badge.bridge-status-current-built-in {

  • toolkit/components/torconnect/content/torConnectTitlebarStatus.css
    ... ... @@ -44,7 +44,7 @@
    44 44 
     }
    45 45
    46 46 
     #tor-connect-titlebar-status.tor-connect-status-connected {
    47 
    -  color: var(--tor-accent-color);
    47 
    +  color: var(--tor-text-color);
    48 48 
     }
    49 49
    50 50 
     @keyframes onion-not-connected-to-connected {

  • toolkit/themes/shared/tor-colors.css
    1 1 
     @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
    2 2
    3 3 
     :root {
    4 
    -  /* Photon colors not available in Firefox. */
    5 
    -  --purple-30: #c069ff;
    6 
    -  --purple-40: #ad3bff;
    7 
    -  --purple-50: #9400ff;
    8 
    -  --purple-60: #8000d7;
    9 
    -  --purple-70: #6200a4;
    10 
    -  --purple-80: #440071;
    11 
    -  --purple-90: #25003e;
    12 
    -
    13 4 
       /* On light backgrounds. */
    14 
    -  --tor-accent-color-light: var(--purple-60);
    15 
    -  --tor-accent-color-hover-light: var(--purple-70);
    16 
    -  --tor-accent-color-active-light: var(--purple-80);
    17 
    -
    18 
    -  /* Acorn color grey light 05. */
    5 
    +  --tor-accent-color-light: var(--color-purple-60);
    6 
    +  --tor-accent-color-hover-light: var(--color-purple-70);
    7 
    +  --tor-accent-color-active-light: var(--color-purple-80);
    8 
    +  /* Color for text on --background-color-canvas. */
    9 
    +  --tor-text-color-light: var(--color-purple-60);
    10 
    +  /* Buttons. */
    19 11 
       --tor-button-text-color-light: var(--color-gray-05);
    20 12 
       --tor-button-text-color-hover-light: var(--color-gray-05);
    21 13 
       --tor-button-text-color-active-light: var(--color-gray-05);
    ... ... @@ -23,26 +15,27 @@
    23 15 
       --tor-button-background-color-hover-light: var(--tor-accent-color-hover-light);
    24 16 
       --tor-button-background-color-active-light: var(--tor-accent-color-active-light);
    25 17 
       --tor-focus-outline-color-light: var(--tor-accent-color-light);
    18 
    +  /* Links. */
    26 19 
       --tor-link-color-light: var(--tor-accent-color-light);
    27 20 
       --tor-link-color-hover-light: var(--tor-accent-color-hover-light);
    28 21 
       --tor-link-color-active-light: var(--tor-accent-color-active-light);
    29 22
    30 23
    31 24 
       /* On dark backgrounds. */
    32 
    -  /* TODO: Need a dark theme purple color that gets *lighter* with hover and
    33 
    -   * active states, see tor-browser#42025 */
    34 
    -  --tor-accent-color-dark: var(--purple-30);
    35 
    -  --tor-accent-color-hover-dark: var(--purple-40);
    36 
    -  --tor-accent-color-active-dark: var(--purple-50);
    37 
    -
    38 
    -  /* TODO: Use a dark text color for dark theme. tor-browser#41787. */
    39 
    -  --tor-button-text-color-dark: var(--color-gray-05);
    40 
    -  --tor-button-text-color-hover-dark: var(--color-gray-05);
    41 
    -  --tor-button-text-color-active-dark: var(--color-gray-05);
    25 
    +  --tor-accent-color-dark: var(--color-purple-30);
    26 
    +  --tor-accent-color-hover-dark: var(--color-purple-20);
    27 
    +  --tor-accent-color-active-dark: var(--color-purple-10);
    28 
    +  /* Color for text on --background-color-canvas. */
    29 
    +  --tor-text-color-dark: var(--color-purple-20);
    30 
    +  /* Buttons. */
    31 
    +  --tor-button-text-color-dark: var(--color-gray-100);
    32 
    +  --tor-button-text-color-hover-dark: var(--color-gray-100);
    33 
    +  --tor-button-text-color-active-dark: var(--color-gray-100);
    42 34 
       --tor-button-background-color-dark: var(--tor-accent-color-dark);
    43 35 
       --tor-button-background-color-hover-dark: var(--tor-accent-color-hover-dark);
    44 36 
       --tor-button-background-color-active-dark: var(--tor-accent-color-active-dark);
    45 37 
       --tor-focus-outline-color-dark: var(--tor-accent-color-dark);
    38 
    +  /* Links. */
    46 39 
       --tor-link-color-dark: var(--tor-accent-color-dark);
    47 40 
       --tor-link-color-hover-dark: var(--tor-accent-color-hover-dark);
    48 41 
       --tor-link-color-active-dark: var(--tor-accent-color-active-dark);
    ... ... @@ -61,6 +54,10 @@
    61 54 
         var(--tor-accent-color-active-light),
    62 55 
         var(--tor-accent-color-active-dark)
    63 56 
       );
    57 
    +  --tor-text-color: light-dark(
    58 
    +    var(--tor-text-color-light),
    59 
    +    var(--tor-text-color-dark)
    60 
    +  );
    64 61 
       --tor-button-text-color: light-dark(
    65 62 
         var(--tor-button-text-color-light),
    66 63 
         var(--tor-button-text-color-dark)
    ... ... @@ -110,6 +107,9 @@
    110 107 
         --tor-accent-color-hover: var(--color-accent-primary-hover);
    111 108 
         --tor-accent-color-active: var(--color-accent-primary-active);
    112 109
    110 
    +    /* Match surrounding text. */
    111 
    +    --tor-text-color: currentColor;
    112 
    +
    113 113 
         /* Use Firefox design system primary button colors. */
    114 114 
         --tor-button-text-color: var(--button-text-color-primary);
    115 115 
         --tor-button-text-color-hover: var(--button-text-color-primary-hover);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2e79fc220c9c6cfbd6222886703d1093b1b9552f...3cf3111eb844f98e8650b5e8e0c1bc9c4f1d64e7 at 1756739746