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

feat: tailwind related improvement #6085

Merged
merged 11 commits into from
Jul 9, 2024
Merged

feat: tailwind related improvement #6085

merged 11 commits into from
Jul 9, 2024

Conversation

iamjoel
Copy link
Collaborator

@iamjoel iamjoel commented Jul 9, 2024

Description

  1. Tailwind upgraded to the latest version: v3.4.4.
  2. Support merging the same category tailwind class name.
  3. Add light and dark theme tailwind class name definition.

Type of Change

  • 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, included: Dify Document
  • Improvement, including but not limited to code refactoring, performance optimization, and UI/UX improvement
  • Dependency upgrade

Testing Instructions

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

@iamjoel iamjoel marked this pull request as ready for review July 9, 2024 06:11
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Jul 9, 2024
@iamjoel iamjoel requested a review from nite-knite July 9, 2024 06:12
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jul 9, 2024
@iamjoel iamjoel merged commit eff280f into main Jul 9, 2024
6 checks passed
@iamjoel iamjoel deleted the feat/add-theme-vars branch July 9, 2024 07:05
ZhouhaoJiang added a commit that referenced this pull request Jul 9, 2024
* refs/heads/main: (51 commits)
  feat: tailwind related improvement (#6085)
  feat: support AnalyticDB vector store (#5586)
  feat:add tts-streaming config and future (#5492)
  Feat: add index bar to select tool panel of workflow (#6066)
  bump to 0.6.13 (#6078)
  fix: Inconsistency Between Actual and Debug Input Variables (#6055)
  refactor: revamp picker block (#4227)
  chore: remove tsne unused code (#6077)
  fix: relative in overflow div (#5998)
  chore(action): move docker login above Set up QEMU in build-push action workflow (#6073)
  remove clunky welcome message (#6069)
  feat: add request_params field to jina_reader tool (#5610)
  fix azure stream download (#6063)
  chore: hide tracing introduce detail (#6049)
  Address the issue of the absence of poetry in the development container. (#6036)
  Fix authorization header validation to handle bearer types correctly - "authorization config header is required" error (#6040)
  Fix/6034 get random order of categories in explore and workflow is missing in zh hant (#6043)
  Modify slack webhook url validation to allow workflow (#6041) (#6042)
  fix(configs): Update pydantic settings in config files (#6023)
  Fix/incorrect parameter extractor memory (#6038)
  ...
ZhouhaoJiang added a commit that referenced this pull request Jul 9, 2024
* refs/heads/feat/if-elif:
  feat: update if elif
  feat: tailwind related improvement (#6085)
  feat: support AnalyticDB vector store (#5586)

# Conflicts:
#	web/app/components/header/account-setting/members-page/invite-modal/index.tsx
#	web/app/components/header/account-setting/members-page/operation/index.tsx
#	web/app/components/workflow/nodes/if-else/components/condition-item.tsx
#	web/app/components/workflow/nodes/if-else/components/condition-list.tsx

Choose a reason for hiding this comment

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

Hi joel, I am learning frontend dev by studying this project. I check various file locations for the tools used to generate this tailwind-theme-var-define.ts file, still can't find it. Can you point me to the tool you use for both dark/light.css and tailwind-theme-var-define.ts?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This tool has not yet been open sourced. The theme file is generated from the json files exported by figma(Dify's design tool).Dify's design is not open source. So the tool is useless without the design.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm This PR has been approved by a maintainer size:M This PR changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants