Skip to content

Commit 2c3ea5e

Browse files
committed
fix: AppBar text color now defaults to rmd-theme-var(text-primary-on-background)
This should have probably been the default to start with instead of `initial`. It became more of a problem once I started implementing the "Dark theme elevation" feature.
1 parent 28ba828 commit 2c3ea5e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

packages/app-bar/src/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ $rmd-app-bar-default-color: if(
167167
/// @type Map
168168
$rmd-app-bar-theme-values: (
169169
background-color: transparent,
170-
color: initial,
170+
color: rmd-theme-var(text-primary-on-background),
171171
primary: $rmd-app-bar-primary-background-color,
172172
on-primary: $rmd-app-bar-primary-color,
173173
secondary: $rmd-app-bar-secondary-background-color,

packages/app-bar/src/scssVariables.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default {
2424
"rmd-app-bar-default-color": "#000",
2525
"rmd-app-bar-theme-values": {
2626
"background-color": "transparent",
27-
color: "initial",
27+
color: "var(--rmd-theme-text-primary-on-background, #212121)",
2828
primary: "var(--rmd-theme-primary, #9c27b0)",
2929
"on-primary": "var(--rmd-theme-on-primary, #000)",
3030
secondary: "var(--rmd-theme-secondary, #f50057)",

packages/documentation/src/constants/sassdoc/app-bar.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ const sassdoc: PackageSassDoc = {
260260
code:
261261
"$rmd-theme-primary: $rmd-blue-500;\n$rmd-theme-secondary: $rmd-pink-a-200;\n\n.app-bar {\n @include rmd-app-bar-themes;\n}\n",
262262
compiled:
263-
".app-bar {\n background-color: var(--rmd-app-bar-background-color, transparent);\n color: var(--rmd-app-bar-color, initial);\n}\n.app-bar--primary {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-primary,\n var(--rmd-theme-primary, #9c27b0)\n );\n --rmd-app-bar-color: var(\n --rmd-app-bar-on-primary,\n var(--rmd-theme-on-primary, #000)\n );\n}\n.app-bar--secondary {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-secondary,\n var(--rmd-theme-secondary, #f50057)\n );\n --rmd-app-bar-color: var(\n --rmd-app-bar-on-secondary,\n var(--rmd-theme-on-secondary, #000)\n );\n}\n.app-bar--default {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-default-background-color,\n #f5f5f5\n );\n --rmd-app-bar-color: var(--rmd-app-bar-default-color, #000);\n}\n",
263+
".app-bar {\n background-color: var(--rmd-app-bar-background-color, transparent);\n color: var(\n --rmd-app-bar-color,\n var(--rmd-theme-text-primary-on-background, #212121)\n );\n}\n.app-bar--primary {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-primary,\n var(--rmd-theme-primary, #9c27b0)\n );\n --rmd-app-bar-color: var(\n --rmd-app-bar-on-primary,\n var(--rmd-theme-on-primary, #000)\n );\n}\n.app-bar--secondary {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-secondary,\n var(--rmd-theme-secondary, #f50057)\n );\n --rmd-app-bar-color: var(\n --rmd-app-bar-on-secondary,\n var(--rmd-theme-on-secondary, #000)\n );\n}\n.app-bar--default {\n --rmd-app-bar-background-color: var(\n --rmd-app-bar-default-background-color,\n #f5f5f5\n );\n --rmd-app-bar-color: var(--rmd-app-bar-default-color, #000);\n}\n",
264264
type: "scss",
265265
description: "Simple Example",
266266
},
@@ -872,9 +872,9 @@ const sassdoc: PackageSassDoc = {
872872
packageName: "app-bar",
873873
type: "Map",
874874
value:
875-
"(\n background-color: transparent,\n color: initial,\n primary: $rmd-app-bar-primary-background-color,\n on-primary: $rmd-app-bar-primary-color,\n secondary: $rmd-app-bar-secondary-background-color,\n on-secondary: $rmd-app-bar-secondary-color,\n default-background-color: $rmd-app-bar-default-background-color,\n default-light-background-color: $rmd-app-bar-default-light-theme-background-color,\n default-dark-background-color: $rmd-app-bar-default-dark-theme-background-color,\n default-color: $rmd-app-bar-default-color,\n default-light-color: $rmd-app-bar-default-light-theme-color,\n default-dark-color: $rmd-app-bar-default-dark-theme-color,\n height: $rmd-app-bar-height,\n dense-height: $rmd-app-bar-dense-height,\n prominent-height: $rmd-app-bar-prominent-height,\n prominent-dense-height: $rmd-app-bar-prominent-dense-height,\n)",
875+
"(\n background-color: transparent,\n color: rmd-theme-var(text-primary-on-background),\n primary: $rmd-app-bar-primary-background-color,\n on-primary: $rmd-app-bar-primary-color,\n secondary: $rmd-app-bar-secondary-background-color,\n on-secondary: $rmd-app-bar-secondary-color,\n default-background-color: $rmd-app-bar-default-background-color,\n default-light-background-color: $rmd-app-bar-default-light-theme-background-color,\n default-dark-background-color: $rmd-app-bar-default-dark-theme-background-color,\n default-color: $rmd-app-bar-default-color,\n default-light-color: $rmd-app-bar-default-light-theme-color,\n default-dark-color: $rmd-app-bar-default-dark-theme-color,\n height: $rmd-app-bar-height,\n dense-height: $rmd-app-bar-dense-height,\n prominent-height: $rmd-app-bar-prominent-height,\n prominent-dense-height: $rmd-app-bar-prominent-dense-height,\n)",
876876
compiled:
877-
"(\n background-color: transparent,\n color: initial,\n primary: var(--rmd-theme-primary, #9c27b0),\n on-primary: var(--rmd-theme-on-primary, #000),\n secondary: var(--rmd-theme-secondary, #f50057),\n on-secondary: var(--rmd-theme-on-secondary, #000),\n default-background-color: #f5f5f5,\n default-light-background-color: #f5f5f5,\n default-dark-background-color: #212121,\n default-color: #000,\n default-light-color: #000,\n default-dark-color: #fff,\n height: 3.5rem,\n dense-height: 3rem,\n prominent-height: 7rem,\n prominent-dense-height: 6rem,\n)",
877+
"(\n background-color: transparent,\n color: var(--rmd-theme-text-primary-on-background, #212121),\n primary: var(--rmd-theme-primary, #9c27b0),\n on-primary: var(--rmd-theme-on-primary, #000),\n secondary: var(--rmd-theme-secondary, #f50057),\n on-secondary: var(--rmd-theme-on-secondary, #000),\n default-background-color: #f5f5f5,\n default-light-background-color: #f5f5f5,\n default-dark-background-color: #212121,\n default-color: #000,\n default-light-color: #000,\n default-dark-color: #fff,\n height: 3.5rem,\n dense-height: 3rem,\n prominent-height: 7rem,\n prominent-dense-height: 6rem,\n)",
878878
overridable: true,
879879
},
880880
},

0 commit comments

Comments
 (0)