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

[FW][FIX] base_import: fix background color in dark mode #158822

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 22, 2024

This commit adapts base_import's background that was too dark compared to other modules. This was caused by the use of a bg-white class that is not very "dark-mode friendly" as it will display as a pure black, which is not visually appealing and not wanted.

This commit also adapts the background color of the sidebar to make it more consistent with other modules.

We also add a bg-view class to the table, so it stands out more in light mode and stays the same in dark mode.

task-3814508

Before After
Screenshot 2024-03-22 at 08 32 26 Screenshot 2024-03-22 at 08 34 08
Screenshot 2024-03-22 at 08 32 42 Screenshot 2024-03-22 at 08 34 19
Screenshot 2024-03-22 at 08 59 52 Screenshot 2024-03-22 at 08 57 41
Screenshot 2024-03-22 at 08 33 08 Screenshot 2024-03-22 at 08 33 59

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #158019

@robodoo
Copy link
Contributor

robodoo commented Mar 22, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 22, 2024

@anso-odoo @pparidans cherrypicking of pull request #158019 failed.

stdout:

Auto-merging addons/base_import/static/src/import_action/import_action.xml
Auto-merging addons/base_import/static/src/import_data_content/import_data_content.xml
Auto-merging addons/base_import/static/src/import_data_sidepanel/import_data_sidepanel.xml
CONFLICT (content): Merge conflict in addons/base_import/static/src/import_data_sidepanel/import_data_sidepanel.xml

stderr:

14:08:26.797563 git.c:463               trace: built-in: git cherry-pick b05a7b575f34af07a0ca287d63637ba0f59307d7
error: could not apply b05a7b575f34... [FIX] base_import: fix background color in dark mode
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 22, 2024
This commit adapts `base_import`'s background that was too dark
compared to other modules. This was caused by the use of a `bg-white`
class that is not very "dark-mode friendly" as it will display as a
pure black, which is not visually appealing and not wanted.

This commit also adapts the background color of the sidebar to make it
more consistent with other modules.

We also add a `bg-view` class to the table, so it stands out more in
light mode and stays the same in dark mode.

task-3814508

X-original-commit: 5713192
@pparidans pparidans force-pushed the 17.0-saas-16.3-base-import-dark-mode-fix-anso-uziY-fw branch from 3f46152 to ecac2c0 Compare March 22, 2024 13:27
@C3POdoo C3POdoo requested review from a team, rco-odoo and ryv-odoo and removed request for a team March 22, 2024 13:45
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 22, 2024
Copy link
Contributor

@pparidans pparidans left a comment

Choose a reason for hiding this comment

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

@robodoo robodoo closed this in e7d0b3b Mar 26, 2024
@fw-bot fw-bot deleted the 17.0-saas-16.3-base-import-dark-mode-fix-anso-uziY-fw branch April 9, 2024 11:46
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
This commit adapts `base_import`'s background that was too dark
compared to other modules. This was caused by the use of a `bg-white`
class that is not very "dark-mode friendly" as it will display as a
pure black, which is not visually appealing and not wanted.

This commit also adapts the background color of the sidebar to make it
more consistent with other modules.

We also add a `bg-view` class to the table, so it stands out more in
light mode and stays the same in dark mode.

task-3814508

closes odoo#158822

X-original-commit: 5713192
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants