diff --git a/.changeset/cold-plums-doubt.md b/.changeset/cold-plums-doubt.md new file mode 100644 index 00000000000..27b2ecc5ae4 --- /dev/null +++ b/.changeset/cold-plums-doubt.md @@ -0,0 +1,5 @@ +--- +"@khanacademy/perseus-editor": patch +--- + +Updates WB `color` references to use the new `semanticColor` tokens instead. diff --git a/packages/perseus-editor/src/components/__stories__/device-framer.stories.tsx b/packages/perseus-editor/src/components/__stories__/device-framer.stories.tsx index c1043a8f3e7..e57b656ebd4 100644 --- a/packages/perseus-editor/src/components/__stories__/device-framer.stories.tsx +++ b/packages/perseus-editor/src/components/__stories__/device-framer.stories.tsx @@ -1,4 +1,4 @@ -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import * as React from "react"; import DeviceFramer from "../device-framer"; @@ -17,8 +17,9 @@ const SampleContent = () => { return (
{ rx={borderRadius} /> directly with your * own
that wraps all text fields in the form. **/ -import {color, color as WBColor} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet, css} from "aphrodite"; import * as React from "react"; @@ -150,8 +150,8 @@ class FormWrappedTextField extends React.Component { } const borderColorStyle = focused - ? focusBorderColor || WBColor.blue - : borderColor || WBColor.offBlack16; + ? focusBorderColor || semanticColor.focus.outer + : borderColor || semanticColor.core.border.neutral.subtle; extraStyles.border = `1px solid ${borderColorStyle}`; const wrappedIcon = icon && ( @@ -234,7 +234,7 @@ const styles = StyleSheet.create({ marginBottom: 0, }, defaultBackground: { - backgroundColor: color.white, + backgroundColor: semanticColor.core.background.base.default, }, icon: { display: "flex", diff --git a/packages/perseus-editor/src/components/heading.tsx b/packages/perseus-editor/src/components/heading.tsx index d5b25347bd3..426b5d24da3 100644 --- a/packages/perseus-editor/src/components/heading.tsx +++ b/packages/perseus-editor/src/components/heading.tsx @@ -1,6 +1,6 @@ import Clickable from "@khanacademy/wonder-blocks-clickable"; import {View} from "@khanacademy/wonder-blocks-core"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -49,7 +49,7 @@ const styles = StyleSheet.create({ // match otherwise there's a gap from this header to the edge // of the editor borders. marginInline: -10, - backgroundColor: color.offBlack8, + backgroundColor: semanticColor.core.background.neutral.subtle, padding: spacing.xSmall_8, width: "calc(100% + 20px)", }, diff --git a/packages/perseus-editor/src/widgets/__tests__/__snapshots__/label-image-editor.test.tsx.snap b/packages/perseus-editor/src/widgets/__tests__/__snapshots__/label-image-editor.test.tsx.snap index ffc28bb0ae2..1a78b60cea3 100644 --- a/packages/perseus-editor/src/widgets/__tests__/__snapshots__/label-image-editor.test.tsx.snap +++ b/packages/perseus-editor/src/widgets/__tests__/__snapshots__/label-image-editor.test.tsx.snap @@ -13,8 +13,8 @@ exports[`label-image-editor popover direction snapshots should render with DOWN class="components_jro6t0" > Graph the correct answer in the graph below and ensure diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-description.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-description.tsx index 8fbc6938136..b76fcdf4c8a 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-description.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-description.tsx @@ -1,7 +1,7 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {TextArea, TextField} from "@khanacademy/wonder-blocks-form"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge, LabelXSmall} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -79,7 +79,7 @@ export default function InteractiveGraphDescription(props: Props) { const styles = StyleSheet.create({ caption: { - color: color.offBlack64, + color: semanticColor.core.foreground.neutral.subtle, paddingTop: spacing.xxSmall_6, paddingBottom: spacing.xxSmall_6, }, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-settings.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-settings.tsx index e661d0f41fb..f40ad70fd70 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-settings.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/components/interactive-graph-settings.tsx @@ -12,7 +12,7 @@ import Banner from "@khanacademy/wonder-blocks-banner"; import Button from "@khanacademy/wonder-blocks-button"; import {View} from "@khanacademy/wonder-blocks-core"; import {Checkbox} from "@khanacademy/wonder-blocks-form"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {css, StyleSheet} from "aphrodite"; import * as React from "react"; import _ from "underscore"; @@ -755,7 +755,7 @@ const styles = StyleSheet.create({ marginTop: 0, }, backgroundUrlInput: { - border: `1px solid ${color.offBlack32}`, + border: `1px solid ${semanticColor.core.border.neutral.subtle}`, borderRadius: spacing.xxxSmall_4, padding: spacing.xxxSmall_4, }, @@ -767,10 +767,10 @@ const styles = StyleSheet.create({ }, protractorSection: { marginTop: spacing.xSmall_8, - borderTop: `1px solid ${color.offBlack16}`, + borderTop: `1px solid ${semanticColor.core.border.neutral.subtle}`, paddingTop: spacing.xSmall_8, paddingBottom: spacing.xSmall_8, - borderBottom: `1px solid ${color.offBlack16}`, + borderBottom: `1px solid ${semanticColor.core.border.neutral.subtle}`, }, }); diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/color-swatch.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/color-swatch.tsx index 78d1512d2e5..cfa8692c0a6 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/color-swatch.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/color-swatch.tsx @@ -3,7 +3,7 @@ import { type LockedFigureColor, } from "@khanacademy/perseus-core"; import {View} from "@khanacademy/wonder-blocks-core"; -import {color as wbColor, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -30,7 +30,7 @@ const ColorSwatch = (props: Props) => { border: `4px solid ${lockedFigureColors[color]}`, backgroundColor: filled ? lockedFigureColors[color] - : wbColor.white, + : semanticColor.core.background.base.default, }, ]} /> @@ -41,7 +41,7 @@ const styles = StyleSheet.create({ colorSwatch: { // Add a white outline so that the color swatch is visible when // the dropdown option is highlighted with its blue background. - outline: `2px solid ${wbColor.offWhite}`, + outline: `2px solid ${semanticColor.focus.inner}`, borderRadius: "50%", width: spacing.large_24, height: spacing.large_24, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/ellipse-swatch.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/ellipse-swatch.tsx index bbb9194b3b3..6013df136a7 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/ellipse-swatch.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/ellipse-swatch.tsx @@ -3,7 +3,7 @@ import { lockedFigureFillStyles, } from "@khanacademy/perseus-core"; import {View} from "@khanacademy/wonder-blocks-core"; -import {color as wbColor, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -51,11 +51,11 @@ const styles = StyleSheet.create({ container: { // Add a white outline so that the color swatch is visible when // the dropdown option is highlighted with its blue background. - outline: `2px solid ${wbColor.offWhite}`, + outline: `2px solid ${semanticColor.focus.inner}`, borderRadius: "50%", width: spacing.xLarge_32, height: spacing.large_24, - backgroundColor: wbColor.white, + backgroundColor: semanticColor.core.background.base.default, alignItems: "center", justifyContent: "center", }, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/line-swatch.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/line-swatch.tsx index 1e82cd1204d..8567b3642fd 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/line-swatch.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/line-swatch.tsx @@ -3,7 +3,7 @@ import { type LockedFigureColor, } from "@khanacademy/perseus-core"; import {View} from "@khanacademy/wonder-blocks-core"; -import {color as wbColor, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -32,7 +32,7 @@ const LineSwatch = (props: Props) => { const styles = StyleSheet.create({ container: { - backgroundColor: wbColor.white, + backgroundColor: semanticColor.core.background.base.default, justifyContent: "center", padding: spacing.xSmall_8, borderRadius: spacing.xxxSmall_4, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-ellipse-settings.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-ellipse-settings.tsx index 631ddab8989..4b930cb1836 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-ellipse-settings.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-ellipse-settings.tsx @@ -11,7 +11,7 @@ import {Strut} from "@khanacademy/wonder-blocks-layout"; import { sizing, spacing, - color as wbColor, + semanticColor, } from "@khanacademy/wonder-blocks-tokens"; import {LabelMedium, LabelLarge} from "@khanacademy/wonder-blocks-typography"; import plusCircle from "@phosphor-icons/core/regular/plus-circle.svg"; @@ -342,11 +342,11 @@ const styles = StyleSheet.create({ alignSelf: "start", }, labelContainer: { - backgroundColor: wbColor.white, + backgroundColor: semanticColor.core.background.base.default, }, horizontalRule: { height: 1, - backgroundColor: wbColor.offBlack16, + backgroundColor: semanticColor.core.border.neutral.subtle, }, }); diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-aria.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-aria.tsx index 2bb9b37cbf8..cd6754a456f 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-aria.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-aria.tsx @@ -3,7 +3,7 @@ import Button from "@khanacademy/wonder-blocks-button"; import {View} from "@khanacademy/wonder-blocks-core"; import {TextArea} from "@khanacademy/wonder-blocks-form"; import {Spring, Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelMedium, LabelXSmall} from "@khanacademy/wonder-blocks-typography"; import pencilCircle from "@phosphor-icons/core/regular/pencil-circle.svg"; import {StyleSheet} from "aphrodite"; @@ -97,7 +97,7 @@ const styles = StyleSheet.create({ alignSelf: "start", }, caption: { - color: color.offBlack64, + color: semanticColor.core.foreground.neutral.subtle, }, }); diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-select.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-select.tsx index 3a948c24852..25405cdf39b 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-select.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-figure-select.tsx @@ -7,7 +7,7 @@ */ import {View} from "@khanacademy/wonder-blocks-core"; import {ActionItem, ActionMenu} from "@khanacademy/wonder-blocks-dropdown"; -import {spacing, color} from "@khanacademy/wonder-blocks-tokens"; +import {spacing, semanticColor} from "@khanacademy/wonder-blocks-tokens"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -54,7 +54,7 @@ const styles = StyleSheet.create({ marginTop: spacing.xSmall_8, }, addElementSelect: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, borderRadius: spacing.xxxSmall_4, }, }); diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-function-settings.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-function-settings.tsx index 4d4b4bf8607..5d096062af6 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-function-settings.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-function-settings.tsx @@ -11,7 +11,11 @@ import {OptionItem, SingleSelect} from "@khanacademy/wonder-blocks-dropdown"; import {TextField} from "@khanacademy/wonder-blocks-form"; import IconButton from "@khanacademy/wonder-blocks-icon-button"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, sizing, spacing} from "@khanacademy/wonder-blocks-tokens"; +import { + semanticColor, + sizing, + spacing, +} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge, LabelMedium} from "@khanacademy/wonder-blocks-typography"; import copyIcon from "@phosphor-icons/core/assets/regular/copy.svg"; import autoPasteIcon from "@phosphor-icons/core/assets/regular/note-pencil.svg"; @@ -479,7 +483,7 @@ const styles = StyleSheet.create({ }, exampleContainer: { background: "white", - border: `1px solid ${color.fadedOffBlack16}`, + border: `1px solid ${semanticColor.core.border.neutral.subtle}`, borderRadius: "4px", flexGrow: "1", listStyleType: "none", @@ -494,7 +498,7 @@ const styles = StyleSheet.create({ exampleContent: { fontFamily: `"Lato", sans-serif`, flexGrow: "1", - color: color.offBlack, + color: semanticColor.core.foreground.neutral.strong, }, exampleRow: { alignItems: "center", @@ -503,7 +507,7 @@ const styles = StyleSheet.create({ minHeight: "44px", }, exampleWorkspace: { - background: color.white50, + background: semanticColor.core.background.base.subtle, }, rowSpace: { marginTop: spacing.xSmall_8, @@ -523,10 +527,10 @@ const styles = StyleSheet.create({ }, horizontalRule: { height: 1, - backgroundColor: color.offBlack16, + backgroundColor: semanticColor.core.border.neutral.subtle, }, labelContainer: { - backgroundColor: color.white, + backgroundColor: semanticColor.core.background.base.default, }, }); diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-label-settings.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-label-settings.tsx index 4e670c84a30..1a9a4684e8e 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-label-settings.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/locked-figures/locked-label-settings.tsx @@ -14,7 +14,7 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {OptionItem, SingleSelect} from "@khanacademy/wonder-blocks-dropdown"; import {TextField} from "@khanacademy/wonder-blocks-form"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {spacing, color as wbColor} from "@khanacademy/wonder-blocks-tokens"; +import {spacing, semanticColor} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge, LabelMedium} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -93,7 +93,9 @@ export default function LockedLabelSettings(props: Props) { { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, @@ -86,8 +86,8 @@ const styles = StyleSheet.create({ marginTop: spacing.small_12, }, equationBody: { - backgroundColor: color.fadedOffBlack8, - border: `1px solid ${color.fadedOffBlack32}`, + backgroundColor: semanticColor.core.background.neutral.subtle, + border: `1px solid ${semanticColor.core.border.neutral.subtle}`, marginTop: spacing.xSmall_8, paddingLeft: spacing.xSmall_8, paddingRight: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-circle.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-circle.tsx index 9e6c382b391..f8cd6368bf3 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-circle.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-circle.tsx @@ -1,6 +1,6 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -82,7 +82,7 @@ const StartCoordsCircle = (props: Props) => { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-line.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-line.tsx index 54a7a40a076..b0306b709c5 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-line.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-line.tsx @@ -1,6 +1,6 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -43,7 +43,7 @@ const StartCoordsLine = (props: Props) => { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-point.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-point.tsx index 1aae3d4413a..ec88c2210a1 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-point.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-point.tsx @@ -1,6 +1,6 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, spacing} from "@khanacademy/wonder-blocks-tokens"; import {LabelLarge} from "@khanacademy/wonder-blocks-typography"; import {StyleSheet} from "aphrodite"; import * as React from "react"; @@ -42,7 +42,7 @@ const StartCoordsPoint = (props: Props) => { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-quadratic.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-quadratic.tsx index 7347ede7959..4dea0ba9d80 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-quadratic.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-quadratic.tsx @@ -1,6 +1,6 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, font, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, font, spacing} from "@khanacademy/wonder-blocks-tokens"; import { BodyMonospace, LabelLarge, @@ -73,7 +73,7 @@ const StartCoordsQuadratic = (props: Props) => { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, @@ -84,8 +84,8 @@ const styles = StyleSheet.create({ marginTop: spacing.small_12, }, equationBody: { - backgroundColor: color.fadedOffBlack8, - border: `1px solid ${color.fadedOffBlack32}`, + backgroundColor: semanticColor.core.background.neutral.subtle, + border: `1px solid ${semanticColor.core.border.neutral.subtle}`, marginTop: spacing.xSmall_8, paddingLeft: spacing.xSmall_8, paddingRight: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-sinusoid.tsx b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-sinusoid.tsx index f915b15517a..99ecdac2df5 100644 --- a/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-sinusoid.tsx +++ b/packages/perseus-editor/src/widgets/interactive-graph-editor/start-coords/start-coords-sinusoid.tsx @@ -1,6 +1,6 @@ import {View} from "@khanacademy/wonder-blocks-core"; import {Strut} from "@khanacademy/wonder-blocks-layout"; -import {color, font, spacing} from "@khanacademy/wonder-blocks-tokens"; +import {semanticColor, font, spacing} from "@khanacademy/wonder-blocks-tokens"; import { BodyMonospace, LabelLarge, @@ -60,7 +60,7 @@ const StartCoordsSinusoid = (props: Props) => { const styles = StyleSheet.create({ tile: { - backgroundColor: color.fadedBlue8, + backgroundColor: semanticColor.core.background.instructive.subtle, marginTop: spacing.xSmall_8, padding: spacing.small_12, borderRadius: spacing.xSmall_8, @@ -71,8 +71,8 @@ const styles = StyleSheet.create({ marginTop: spacing.small_12, }, equationBody: { - backgroundColor: color.fadedOffBlack8, - border: `1px solid ${color.fadedOffBlack32}`, + backgroundColor: semanticColor.core.background.neutral.subtle, + border: `1px solid ${semanticColor.core.border.neutral.subtle}`, marginTop: spacing.xSmall_8, paddingLeft: spacing.xSmall_8, paddingRight: spacing.xSmall_8, diff --git a/packages/perseus-editor/src/widgets/label-image-editor/__snapshots__/marker.test.tsx.snap b/packages/perseus-editor/src/widgets/label-image-editor/__snapshots__/marker.test.tsx.snap index d5663d52e7d..665f93fc10d 100644 --- a/packages/perseus-editor/src/widgets/label-image-editor/__snapshots__/marker.test.tsx.snap +++ b/packages/perseus-editor/src/widgets/label-image-editor/__snapshots__/marker.test.tsx.snap @@ -32,8 +32,8 @@ exports[`Marker component rendering renders an empty marker 1`] = ` class="labelContainer_cyxkvw" > {String.fromCharCode(65 + index)}