-
Notifications
You must be signed in to change notification settings - Fork 3.6k
[WEB-5614] fix: new design system consistency #8351
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
0ee6b78
315facc
c03858f
c8d3286
010fbca
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -156,10 +156,10 @@ export const CycleSidebarHeader = observer(function CycleSidebarHeader(props: Pr | |||||
| <div className="sticky z-10 top-0 pt-2 flex items-center justify-between bg-surface-1"> | ||||||
| <div className="flex items-center justify-center size-5"> | ||||||
| <button | ||||||
| className="flex size-4 items-center justify-center rounded-full bg-layer-3" | ||||||
| className="flex size-6 items-center justify-center rounded-full bg-layer-3 hover:bg-layer-3-hover flex-shrink-0" | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Verify layer level: should be The button is directly nested within a Based on learnings, design system layer stacking guidelines. Apply this diff to use the correct layer level: - className="flex size-6 items-center justify-center rounded-full bg-layer-3 hover:bg-layer-3-hover flex-shrink-0"
+ className="flex size-6 items-center justify-center rounded-full bg-layer-1 hover:bg-layer-1-hover flex-shrink-0"📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| onClick={() => handleClose()} | ||||||
| > | ||||||
| <ChevronRightIcon className="h-3 w-3 stroke-2 text-on-color" /> | ||||||
| <ChevronRightIcon className="size-4 stroke-2 text-secondary" /> | ||||||
| </button> | ||||||
| </div> | ||||||
| </div> | ||||||
|
|
@@ -168,7 +168,7 @@ export const CycleSidebarHeader = observer(function CycleSidebarHeader(props: Pr | |||||
| <h4 className="w-full break-words text-18 font-semibold text-primary">{cycleDetails.name}</h4> | ||||||
| {currentCycle && ( | ||||||
| <span | ||||||
| className="flex h-6 min-w-20 px-3 items-center justify-center rounded-sm text-center text-11 font-medium" | ||||||
| className="flex h-6 min-w-20 px-3 items-center justify-center rounded-sm text-center text-11 font-medium whitespace-nowrap truncate" | ||||||
| style={{ | ||||||
| color: currentCycle.color, | ||||||
| backgroundColor: `${currentCycle.color}20`, | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -35,9 +35,9 @@ export const LabelListItem = observer(function LabelListItem(props: TLabelListIt | |||||||||||||||||||||||
| key={labelId} | ||||||||||||||||||||||||
| type="button" | ||||||||||||||||||||||||
| className={cn( | ||||||||||||||||||||||||
| "h-full w-min flex items-center gap-1.5 rounded-lg px-2 py-0.5 bg-layer-transparent-active hover:bg-layer-transparent-hover text-body-xs-regular text-tertiary", | ||||||||||||||||||||||||
| "h-full w-min flex items-center gap-1.5 rounded-lg px-2 py-0.5 bg-layer-transparent-active group text-body-xs-regular text-tertiary", | ||||||||||||||||||||||||
| { | ||||||||||||||||||||||||
| "cursor-pointer hover:border-danger-strong hover:bg-danger-subtle": !disabled, | ||||||||||||||||||||||||
| "cursor-pointer": !disabled, | ||||||||||||||||||||||||
|
Comment on lines
+38
to
+40
|
||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| )} | ||||||||||||||||||||||||
|
Comment on lines
+38
to
42
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Incorrect usage of The button is using Apply this diff to use the correct base background with hover state: className={cn(
- "h-full w-min flex items-center gap-1.5 rounded-lg px-2 py-0.5 bg-layer-transparent-active group text-body-xs-regular text-tertiary",
+ "h-full w-min flex items-center gap-1.5 rounded-lg px-2 py-0.5 bg-layer-transparent hover:bg-layer-transparent-hover group text-body-xs-regular text-tertiary",
{
- "cursor-pointer": !disabled,
+ "cursor-pointer hover:border-danger-strong": !disabled,
}
)}Based on learnings: Use 📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||
| onClick={handleLabel} | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -198,7 +198,7 @@ export const ProjectCard = observer(function ProjectCard(props: Props) { | |
| } | ||
| }} | ||
| data-prevent-progress={!isMemberOfProject || isArchived} | ||
| className="flex flex-col rounded-sm border border-subtle bg-layer-1 hover:bg-layer-1-hover rounded-xl overflow-hidden" | ||
| className="flex flex-col border border-subtle bg-layer-2 hover:shadow-raised-2x00 rounded-lg overflow-hidden duration-300 transition-all" | ||
|
||
| > | ||
| <ContextMenu parentRef={projectCardRef} items={MENU_ITEMS} /> | ||
| <div className="relative h-[118px] w-full rounded-t "> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,7 +105,7 @@ ul[data-type="taskList"] li > div { | |
| } | ||
|
|
||
| ul[data-type="taskList"] li > label input[type="checkbox"] { | ||
| @apply border! border-strong/20!; | ||
| @apply border! border-strong!; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# First, let's see the file structure around line 108
head -n 160 packages/editor/src/styles/editor.css | tail -n 60Repository: makeplane/plane Length of output: 1629 🏁 Script executed: #!/bin/bash
# Search for all rules targeting the checkbox selector
rg -n "ul\[data-type=\"taskList\"\].*input\[type=\"checkbox\"\]" packages/editor/src/styles/editor.cssRepository: makeplane/plane Length of output: 340 🏁 Script executed: #!/bin/bash
# Get the full CSS rules at lines 107-112 and 144-180 to see the complete duplicate
sed -n '107,115p' packages/editor/src/styles/editor.css
echo "---SEPARATOR---"
sed -n '144,165p' packages/editor/src/styles/editor.cssRepository: makeplane/plane Length of output: 872 🏁 Script executed: #!/bin/bash
# Check if the file has been properly formatted with Prettier
# Also check the entire structure to understand if this is part of a nested rule or separate rules
wc -l packages/editor/src/styles/editor.css
echo "---Checking for SCSS nesting syntax---"
sed -n '144,160p' packages/editor/src/styles/editor.cssRepository: makeplane/plane Length of output: 548 🏁 Script executed: #!/bin/bash
# Let's see the full context - check if this is SCSS with proper nesting
# Look for the opening brace before line 107 to understand structure
sed -n '100,180p' packages/editor/src/styles/editor.css | cat -nRepository: makeplane/plane Length of output: 2646 🏁 Script executed: #!/bin/bash
# Check the git history to understand what changed
git log --oneline -20 packages/editor/src/styles/editor.css
echo "---Now let's see the diff for this file---"
git diff HEAD packages/editor/src/styles/editor.css | head -100Repository: makeplane/plane Length of output: 211 🏁 Script executed: #!/bin/bash
# Check the file type and if it's properly formatted
file packages/editor/src/styles/editor.css
echo "---Check if prettier/tailwind has been run---"
head -20 packages/editor/src/styles/editor.cssRepository: makeplane/plane Length of output: 657 🏁 Script executed: #!/bin/bash
# Let's check the git diff to see what actually changed in this PR
git show HEAD:packages/editor/src/styles/editor.css | sed -n '107,112p'Repository: makeplane/plane Length of output: 219 🏁 Script executed: #!/bin/bash
# Check the previous commit to see the original state
git show HEAD~1:packages/editor/src/styles/editor.css | sed -n '107,112p'Repository: makeplane/plane Length of output: 95 🏁 Script executed: #!/bin/bash
# Check the git status to see what's staged or modified
git status packages/editor/src/styles/editor.css
echo "---Check git log for any recent changes---"
git log --all --oneline packages/editor/src/styles/editor.css | head -5Repository: makeplane/plane Length of output: 540 🏁 Script executed: #!/bin/bash
# Let's check if there's a design system or tailwind config that documents border-strong vs border-subtle-1
find packages/tailwind-config -name "*.md" -o -name "*.js" -o -name "*.ts" | head -20Repository: makeplane/plane Length of output: 136 🏁 Script executed: #!/bin/bash
# Check the AGENTS.md file for border color definitions
cat packages/tailwind-config/AGENTS.mdRepository: makeplane/plane Length of output: 19006 🏁 Script executed: #!/bin/bash
# Verify if the file follows formatting standards by checking for similar patterns
# Search for other duplicate selectors in the file
rg -n "^[a-z].*\{$" packages/editor/src/styles/editor.css | head -30Repository: makeplane/plane Length of output: 905 🏁 Script executed: #!/bin/bash
# Let's look at what's between line 107 and 144 to understand the full context
sed -n '100,148p' packages/editor/src/styles/editor.css | nl -v 100Repository: makeplane/plane Length of output: 101 🏁 Script executed: #!/bin/bash
# Use cat -n to show line numbers
sed -n '100,180p' packages/editor/src/styles/editor.css | cat -n -v 100Repository: makeplane/plane Length of output: 94 🏁 Script executed: #!/bin/bash
# Show lines 100-180 with line numbers
awk 'NR>=100 && NR<=180 {print NR": "$0}' packages/editor/src/styles/editor.cssRepository: makeplane/plane Length of output: 2484 Consolidate the duplicate checkbox selector rules to improve maintainability. The change from 🤖 Prompt for AI Agents |
||
| outline: none; | ||
| border-radius: 2px; | ||
| transform: scale(1.05); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ const TabsRoot = React.forwardRef(function TabsRoot( | |
| const TabsList = React.forwardRef(function TabsList( | ||
| { | ||
| className, | ||
| background = "layer-1", | ||
| background = "layer-2", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🏁 Script executed: # Find the tabs.tsx file and examine it
fd -t f "tabs.tsx" packages/propel/src/ | head -5
# Also check for TabsList usage patterns
rg -n "TabsList|Tabs\.List" packages/ -t ts -t tsx -C 3 | head -100Repository: makeplane/plane Length of output: 137 🏁 Script executed: # First, find tabs.tsx and examine its content
cat packages/propel/src/tabs/tabs.tsxRepository: makeplane/plane Length of output: 4455 🏁 Script executed: # Search for actual usage of TabsList/Tabs.List in the codebase
rg "Tabs\.List|TabsList" packages/ -t ts -t tsx -B 2 -A 2Repository: makeplane/plane Length of output: 86 🏁 Script executed: # Also search for usage of "background.*layer" in tabs-related files to understand context
rg -i "background.*layer|layer.*background" packages/propel/src/tabs/ -t ts -t tsxRepository: makeplane/plane Length of output: 86 🏁 Script executed: # Try finding Tabs.List or TabsList usage without -t flag
rg "Tabs\.List|TabsList|<Tabs" packages/ --include="*.ts" --include="*.tsx" -B 2 -A 2 | head -150Repository: makeplane/plane Length of output: 500 🏁 Script executed: # Search for imports of Tabs from tabs.tsx
rg "from.*tabs/tabs|import.*Tabs.*from" packages/ --include="*.ts" --include="*.tsx" -B 1 -A 1Repository: makeplane/plane Length of output: 500 🏁 Script executed: # Find all files that import Tabs
fd -e tsx -e ts . packages/ | xargs grep -l "from.*tabs/tabs\|import.*Tabs" 2>/dev/null | head -20Repository: makeplane/plane Length of output: 232 🏁 Script executed: # Search for usage patterns of Tabs component
fd -e tsx . packages/ -exec grep -l "Tabs\.List\|<Tabs" {} \; | head -10Repository: makeplane/plane Length of output: 1405 🏁 Script executed: # Look at the AGENTS.md to understand layer guidance
cat packages/tailwind-config/AGENTS.md 2>/dev/null || find packages -name "AGENTS.md" -exec cat {} \;Repository: makeplane/plane Length of output: 19006 🏁 Script executed: # Check the tabs stories to see how TabsList is used
cat packages/propel/src/tabs/tabs.stories.tsxRepository: makeplane/plane Length of output: 11419 🏁 Script executed: # Search for any usage in emoji-picker which was found to use tabs
cat packages/propel/src/emoji-icon-picker/emoji-picker.tsx | head -100Repository: makeplane/plane Length of output: 2926 Default TabsList background should be The default Additionally, 🤖 Prompt for AI Agents |
||
| ...props | ||
| }: React.ComponentProps<typeof TabsPrimitive.List> & { | ||
| background?: BackgroundVariant; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,8 +61,16 @@ export function Tooltip(props: ITooltipProps) { | |
| align={finalAlign} | ||
| render={ | ||
| <BaseTooltip.Popup> | ||
| {tooltipHeading && <div className="text-caption-md-medium text-primary">{tooltipHeading}</div>} | ||
| {tooltipContent && <div className="mt-1 text-caption-sm-regular text-secondary">{tooltipContent}</div>} | ||
| {tooltipHeading && <p className="text-caption-md-medium text-primary">{tooltipHeading}</p>} | ||
| {tooltipContent && ( | ||
| <p | ||
| className={cn("text-caption-sm-regular text-secondary", { | ||
| "mt-1": tooltipHeading && tooltipHeading !== "", | ||
|
||
| })} | ||
| > | ||
| {tooltipContent} | ||
| </p> | ||
| )} | ||
| </BaseTooltip.Popup> | ||
| } | ||
| /> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: makeplane/plane
Length of output: 111
🏁 Script executed:
Repository: makeplane/plane
Length of output: 86
🏁 Script executed:
Repository: makeplane/plane
Length of output: 4804
🏁 Script executed:
Repository: makeplane/plane
Length of output: 2484
🏁 Script executed:
Repository: makeplane/plane
Length of output: 139
🏁 Script executed:
Repository: makeplane/plane
Length of output: 86
🏁 Script executed:
Repository: makeplane/plane
Length of output: 352
🏁 Script executed:
Repository: makeplane/plane
Length of output: 4112
🏁 Script executed:
Repository: makeplane/plane
Length of output: 3132
🏁 Script executed:
Repository: makeplane/plane
Length of output: 6055
🏁 Script executed:
Repository: makeplane/plane
Length of output: 3333
🏁 Script executed:
Repository: makeplane/plane
Length of output: 3851
🏁 Script executed:
Repository: makeplane/plane
Length of output: 41
🏁 Script executed:
Repository: makeplane/plane
Length of output: 6077
🏁 Script executed:
Repository: makeplane/plane
Length of output: 5005
🏁 Script executed:
Repository: makeplane/plane
Length of output: 2685
Use
bg-layer-1or remove the background color to match design system semantics.The editor is a nested form element within a comment card, not a top-level container. Per the design system, nested elements must use Layer classes (
bg-layer-1,bg-layer-2,bg-layer-3) or no background, never Surface classes. The established pattern incomment-create.tsxshows the editor using only padding (p-2) when wrapped in a surface.🤖 Prompt for AI Agents