Commit 6cb350b5 authored by Dão Gottwald's avatar Dão Gottwald
Browse files

Bug 1831642 - Make --panel-description-color and... 

Bug 1831642 - Make --panel-description-color and --in-content-deemphasized-text aliases of --text-color-deemphasized. r=sfoster

Differential Revision: https://phabricator.services.mozilla.com/D177305
parent 37538955

toolkit/themes/shared/design-tokens-brand.css

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
    --color-canvas: var(--color-white);



    /* Text */

    --text-color-deemphasized: var(--color-gray-70);

    --text-color-deemphasized: color-mix(in srgb, currentColor 69%, transparent);

  }

}
@@ -48,6 +48,6 @@ 
    --color-canvas: var(--color-gray-90);



    /* Text */

    --text-color-deemphasized: var(--color-gray-50);

    --text-color-deemphasized: color-mix(in srgb, currentColor 75%, transparent);

  }

}

toolkit/themes/shared/design-tokens-shared.css

+8 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
  --focus-outline-width: 2px;



  /** Text **/

  --text-color-deemphasized: unset;

  --text-color-deemphasized: color-mix(in srgb, currentColor 60%, transparent);



  /** Size **/

  --size-item-small: 16px;
@@ -52,7 +52,8 @@ 




@media (prefers-contrast) {

  :root, :host {

  :root,

  :host {

    /* Button */

    --button-background-color: ButtonFace;

    --button-background-color-hover: ButtonFace;
@@ -63,13 +64,14 @@ 
    --color-canvas: Canvas;



    /* Text */

    --text-color-deemphasized: CanvasText;

    --text-color-deemphasized: inherit;

  }

}



@media (forced-colors) {

  /* Applies to Windows HCM only */

  :root, host {

  :root,

  :host {

    /* Border */

    --border-interactive-color: ButtonText;

    --border-interactive-color-hover: SelectedItem;
@@ -85,7 +87,8 @@ 


@media (forced-colors: none) and (prefers-contrast)  {

  /* Applies to macOS "increase contrast" only */

  :root, host {

  :root,

  :host {

    /* Border */

    --border-interactive-color: AccentColor;

    --border-interactive-color-hover: ButtonText;

toolkit/themes/shared/design-tokens-system.css

+0 −3
Original line number Diff line number Diff line
@@ -22,8 +22,5 @@ 
    --system-color-accent-hover: var(--button-primary-hover-bgcolor);

    --system-color-accent-active: var(--button-primary-active-bgcolor);

    --color-canvas: Canvas;



    /* Text */

    --text-color-deemphasized: var(--panel-description-color);

  }

}

toolkit/themes/shared/global-shared.css

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
  --arrowpanel-dimmed: color-mix(in srgb, currentColor 17%, transparent);

  --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);



  --panel-description-color: color-mix(in srgb, currentColor 60%, transparent);

  --panel-description-color: var(--text-color-deemphasized);

  --panel-disabled-color: color-mix(in srgb, currentColor 40%, transparent);



  --popup-notification-body-width: calc(31em - calc(2 * var(--arrowpanel-padding)));
@@ -53,7 +53,6 @@ 
  :root:not(:-moz-lwtheme) {

    --toolbarbutton-disabled-opacity: 0.3;



    --panel-description-color: inherit;

    --panel-disabled-color: GrayText;

  }

}

toolkit/themes/shared/in-content/common-shared.css

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  --in-content-page-color: rgb(21, 20, 26);

  --in-content-page-background: #fff;

  --in-content-text-color: var(--in-content-page-color);

  --in-content-deemphasized-text: color-mix(in srgb, currentColor 69%, transparent);

  --in-content-deemphasized-text: var(--text-color-deemphasized);

  --in-content-box-background: #fff;

  --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */

  --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent);
@@ -135,7 +135,6 @@ 
     * in-content privileged pages and plain-text documents). */

    --in-content-page-background: rgb(28,27,34);

    --in-content-page-color: rgb(251,251,254);

    --in-content-deemphasized-text: color-mix(in srgb, currentColor 75%, transparent);



    --in-content-box-background: rgb(35, 34, 43);

    --in-content-box-background-odd: rgba(249,249,250,0.05);