Skip to content

Conversation

@corentinbettiol
Copy link

Description

Describe:

  • Various fixes:
    • double image problem
    • dark theme problem
    • updated REASME.rst
    • updated CONTRIBUTING.rst

Checklist

  • I have read the contribution guide
  • Code lint checked via inv lint
  • changes file included (see docs)
  • Usage documentation added in case of new features
  • Tests added

yakky and others added 12 commits April 22, 2023 23:09
updates:
- [github.com/asottile/pyupgrade: v3.3.1 → v3.3.2](asottile/pyupgrade@v3.3.1...v3.3.2)
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.262 → v0.0.263](astral-sh/ruff-pre-commit@v0.0.262...v0.0.263)
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.263 → v0.0.265](astral-sh/ruff-pre-commit@v0.0.263...v0.0.265)
- [github.com/asottile/pyupgrade: v3.3.2 → v3.4.0](asottile/pyupgrade@v3.3.2...v3.4.0)
updates:
- [github.com/charliermarsh/ruff-pre-commit: v0.0.265 → v0.0.267](astral-sh/ruff-pre-commit@v0.0.265...v0.0.267)
Improve display of options (split line)
(contains dark theme-related fixes)
@corentinbettiol
Copy link
Author

corentinbettiol commented Jul 6, 2023

Oops, I thought that develop & feature/django42 didn't have so many different commits, including your recent commits on develop.

What should we do? Is the feature/django42 branch the one that will be used for the release of the next version?


Here's a screenshot of the dialog on my branch:

image

Notice the fixed "search icon", and the "forced" light theme (released in django-ckeditor 6.1.1) :)

@yakky
Copy link
Member

yakky commented Jul 9, 2023

@corentinbettiol feature/django42 has already been merged with #44

You can cherry-pick your commits on a fresh branch from develop and open new PR (or force push on the old branch and change the target branch)

@corentinbettiol corentinbettiol mentioned this pull request Aug 24, 2023
4 tasks
@corentinbettiol
Copy link
Author

See #57 for the cherry-picked commits :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants