Skip to content

Commit 17dd382

Browse files
authored
Add "original" color step and apply to bg-primary-solid elements (#3618)
1 parent 98e42cf commit 17dd382

File tree

8 files changed

+21
-12
lines changed

8 files changed

+21
-12
lines changed

.changeset/sour-rules-explain.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@gitbook/colors": minor
3+
"gitbook": patch
4+
---
5+
6+
Add `original` background color step

packages/colors/src/transformations.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export enum ColorCategory {
1919
}
2020

2121
type ColorSubScale = {
22-
[key: string]: number;
22+
[key: string]: number | string;
2323
};
2424

2525
/**
@@ -56,6 +56,8 @@ export const scale: Record<ColorCategory, ColorSubScale> = {
5656
solid: 9,
5757
/** Hovered solid backgrounds */
5858
'solid-hover': 10,
59+
/** Original color */
60+
original: 'original',
5961
},
6062
[ColorCategory.text]: {
6163
/** Very low-contrast text

packages/gitbook/src/components/DocumentView/Integration/contentkit.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
}
100100

101101
.contentkit-button-style-primary {
102-
@apply bg-primary-solid text-contrast-primary-solid hover:bg-primary-solid-hover hover:text-contrast-primary-solid-hover ring-0 contrast-more:ring-1;
102+
@apply bg-primary-original text-contrast-primary-original hover:bg-primary-solid-hover hover:text-contrast-primary-solid-hover ring-0 contrast-more:ring-1;
103103
}
104104

105105
.contentkit-button-style-secondary {

packages/gitbook/src/components/DocumentView/OpenAPI/scalar.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,8 @@ body {
272272
}
273273
.scalar-activate-button {
274274
@apply flex gap-2 items-center;
275-
@apply bg-primary-solid text-contrast-primary-solid hover:bg-primary-solid-hover hover:text-contrast-primary-solid-hover contrast-more:ring-1 rounded-md straight-corners:rounded-none circular-corners:rounded-full circular-corners:px-3 place-self-start;
276-
@apply ring-1 ring-tint hover:ring-tint-hover;
277-
@apply shadow-sm shadow-tint dark:shadow-tint-1 hover:shadow-md active:shadow-none;
275+
@apply bg-primary-original text-contrast-primary-original hover:bg-primary-solid-hover hover:text-contrast-primary-solid-hover contrast-more:ring-1 rounded-md straight-corners:rounded-none circular-corners:rounded-full circular-corners:px-3 place-self-start;
276+
@apply shadow-sm shadow-primary dark:shadow-primary-1 hover:shadow-md active:shadow-none;
278277
@apply contrast-more:ring-tint-12 contrast-more:hover:ring-2 contrast-more:hover:ring-tint-12;
279278
@apply hover:scale-105 active:scale-100 transition-all;
280279
@apply grow-0 shrink-0 truncate;

packages/gitbook/src/components/DocumentView/StepperStep.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ export function StepperStep(props: BlockProps<DocumentBlockStepperStep>) {
3636
<div className="relative select-none">
3737
<div
3838
className={tcls(
39-
'can-override-bg can-override-text flex size-[calc(1.75rem+1px)] items-center justify-center rounded-full bg-primary-solid theme-muted:bg-primary-subtle tabular-nums',
40-
'font-medium text-contrast-primary-solid theme-muted:text-primary'
39+
'can-override-bg can-override-text flex size-[calc(1.75rem+1px)] items-center justify-center rounded-full bg-primary-original theme-muted:bg-primary-subtle tabular-nums contrast-more:bg-primary-solid',
40+
'font-medium text-contrast-primary-original theme-muted:text-primary contrast-more:text-contrast-primary-solid'
4141
)}
4242
>
4343
{index + 1}

packages/gitbook/src/components/SiteSections/SiteSectionList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export function SiteSectionListItem(props: {
110110
className={tcls(
111111
'flex size-8 shrink-0 items-center justify-center rounded-md straight-corners:rounded-none bg-tint-subtle text-lg text-tint leading-none shadow-tint shadow-xs ring-1 ring-tint-subtle transition-transform group-hover/section-link:scale-110 group-hover/section-link:ring-tint-hover group-active/section-link:scale-90 group-active/section-link:shadow-none contrast-more:text-tint-strong dark:shadow-none',
112112
isActive
113-
? 'bg-primary tint:bg-primary-solid text-primary-subtle tint:text-contrast-primary-solid shadow-md shadow-primary ring-primary group-hover/section-link:ring-primary-hover, contrast-more:text-primary contrast-more:ring-2 contrast-more:ring-primary'
113+
? 'bg-primary tint:bg-primary-original text-primary-subtle tint:text-contrast-primary-original shadow-md shadow-primary ring-primary group-hover/section-link:ring-primary-hover, contrast-more:text-primary contrast-more:ring-2 contrast-more:ring-primary'
114114
: null
115115
)}
116116
>

packages/gitbook/src/components/primitives/Button.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ type ButtonProps = {
2525

2626
export const variantClasses = {
2727
primary: [
28-
'bg-primary-solid',
29-
'text-contrast-primary-solid',
28+
'bg-primary-original',
29+
'text-contrast-primary-original',
3030
'hover:bg-primary-solid-hover',
3131
'hover:text-contrast-primary-solid-hover',
3232
'border-0',
33+
'contrast-more:bg-primary-solid',
34+
'contrast-more:text-contrast-primary-solid',
3335
'contrast-more:border',
3436
'disabled:bg-primary-subtle',
3537
'disabled:text-primary/8',

packages/gitbook/src/components/primitives/Checkbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export const Checkbox = React.forwardRef<
3131
'flex',
3232
'items-center',
3333
'justify-center',
34-
'data-[state=checked]:bg-primary-solid',
35-
'data-[state=checked]:text-contrast-primary-solid',
34+
'data-[state=checked]:bg-primary-original',
35+
'data-[state=checked]:text-contrast-primary-original',
3636
'contrast-more:ring-tint-12',
3737
{ small: 'size-4', medium: 'size-5' }[size],
3838
className

0 commit comments

Comments
 (0)