Skip to content
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

fix: incorrect info color for element plus, fixed #4532 #4566

Merged
merged 1 commit into from
Oct 5, 2024

Conversation

mynetfan
Copy link
Collaborator

@mynetfan mynetfan commented Oct 5, 2024

Description

修复ElementPlus组件info样式的问题,影响多选select组件、alert等组件
修复v-loading指令以及el-loading组件的mask层颜色

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Summary by CodeRabbit

  • New Features

    • Introduced new CSS custom properties for the dark and default themes, enhancing the color palette for informational elements.
    • Added support for improved background color handling based on theme preferences.
  • Bug Fixes

    • Resolved background color issues for loading elements by updating CSS variable assignments.
  • Documentation

    • Enhanced clarity on the use of new CSS variables for informational contexts.

Copy link

changeset-bot bot commented Oct 5, 2024

⚠️ No Changeset found

Latest commit: 4a8218f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link
Contributor

coderabbitai bot commented Oct 5, 2024

Walkthrough

The changes in this pull request introduce new CSS custom properties for the dark and default theme design tokens. Specifically, two properties, --info and --info-foreground, are added to enhance the color palette for informational elements. Additionally, modifications are made to the useElementPlusDesignTokens function to update the assignment of a CSS variable and introduce a new variable that adapts based on the theme preference.

Changes

File Path Change Summary
packages/@core/base/design/src/design-tokens/dark/index.css Added new CSS properties: --info: 180, 1.54%, 12.75%;, --info-foreground: 220, 4%, 58%;
packages/@core/base/design/src/design-tokens/default/index.css Added new CSS properties: --info: 240, 5%, 96%;, --info-foreground: 220, 4%, 58%;
packages/effects/hooks/src/use-design-tokens.ts Updated useElementPlusDesignTokens function to use --info for --el-color-info-light-9 and added --el-mask-color based on isDark state.

Possibly related PRs

Suggested labels

bug

Suggested reviewers

  • vince292007
  • anncwb

🐰 In the dark, a new hue,
--info shines bright and true.
With colors that dance and play,
Informing us in a vibrant way.
A hop, a skip, to the light we go,
With tokens that help our style to grow! 🌈


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (2)
packages/effects/hooks/src/use-design-tokens.ts (1)

262-265: Approve addition of mask color and suggest comment enhancement.

The addition of the '--el-mask-color' CSS variable effectively addresses the background color issue for ElLoading, as mentioned in the PR objectives. The conditional setting based on the dark mode state ensures appropriate contrast in both themes.

Consider enhancing the comment to provide more context:

- // 解决ElLoading背景色问题
+ // Fix background color issue for v-loading directive and el-loading component

This change would make the comment more specific and align it with the PR description, improving clarity for future developers.

packages/@core/base/design/src/design-tokens/default/index.css (1)

41-45: LGTM! Consider adding a comment for clarity.

The addition of --info and --info-foreground variables aligns with the PR objectives and follows the existing pattern for color variables. This change should resolve the styling issue for the info color in ElementPlus components.

For consistency with other color variable groups, consider adding a comment above these new variables:

  /* Used for destructive actions such as <Button variant="destructive"> */

  --destructive: 359.33 100% 65.1%;
  --destructive-foreground: 0 0% 98%;

+ /* Used for informational actions such as <message> */
+
  --info: 240, 5%, 96%;
  --info-foreground: 220, 4%, 58%;

  /* Used for success actions such as <message> */

This comment would improve readability and maintain the documentation style of the file.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 28b54b5 and 4a8218f.

📒 Files selected for processing (3)
  • packages/@core/base/design/src/design-tokens/dark/index.css (1 hunks)
  • packages/@core/base/design/src/design-tokens/default/index.css (1 hunks)
  • packages/effects/hooks/src/use-design-tokens.ts (2 hunks)
🔇 Additional comments (4)
packages/effects/hooks/src/use-design-tokens.ts (2)

219-219: Approve change to info color and suggest visual verification.

The modification of '--el-color-info-light-9' to use the '--info' CSS variable instead of '--secondary' aligns with the PR objective to fix the incorrect info color for ElementPlus. This change is likely to improve the consistency of info-related components.

To ensure the change has the desired effect, please verify the visual appearance of info-related components, such as info alerts or info badges, in both light and dark modes. Consider adding before/after screenshots to the PR description for easier review.


Line range hint 1-274: Summary of changes and their impact.

The modifications in this file effectively address the PR objectives:

  1. The info color for ElementPlus has been corrected by updating the '--el-color-info-light-9' CSS variable.
  2. The mask color for the v-loading directive and el-loading component has been fixed by introducing the '--el-mask-color' CSS variable with appropriate values for light and dark modes.

These targeted changes should resolve the reported issues without introducing significant risks. The modifications are well-commented and maintain the overall structure of the useElementPlusDesignTokens function.

To ensure the changes have the desired effect across the application:

  1. Verify the appearance of info-related components (e.g., info alerts, badges) in both light and dark modes.
  2. Test the v-loading directive and el-loading component in various scenarios to confirm the mask color is correct in both themes.
  3. Consider adding before/after screenshots to the PR description for visual confirmation of the fixes.
packages/@core/base/design/src/design-tokens/default/index.css (1)

41-42: Verify if these changes address all mentioned issues.

The addition of --info and --info-foreground variables should resolve the info color issues for most ElementPlus components. However, the PR objectives also mention problems with the v-loading directive and el-loading component, specifically the color of the mask layer.

Can you confirm if these new variables will also fix the mask layer color for the loading components? If not, additional changes might be needed to fully address all the issues mentioned in the PR description.

packages/@core/base/design/src/design-tokens/dark/index.css (1)

42-43: LGTM: Addition of info color properties aligns with PR objectives

The new CSS custom properties --info and --info-foreground have been added correctly. These additions are consistent with the existing color scheme and use the same HSL color model. This change directly addresses the PR objective of fixing the info color for ElementPlus components, which should resolve the styling issues in multi-select dropdowns, alert components, and potentially the v-loading directive and el-loading component.

@anncwb anncwb merged commit 0fcc42a into vbenjs:main Oct 5, 2024
14 checks passed
@anncwb anncwb added the bug Something isn't working label Oct 5, 2024
@mynetfan mynetfan deleted the fix/ele-info-color branch October 10, 2024 01:06
@coderabbitai coderabbitai bot mentioned this pull request Oct 17, 2024
16 tasks
@github-actions github-actions bot locked and limited conversation to collaborators Nov 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants