Skip to content

fix: use bg-surface-gray-1 for desktop sidebar background (backport #2376)#2378

Open
mergify[bot] wants to merge 3 commits into
main-hotfixfrom
mergify/bp/main-hotfix/pr-2376
Open

fix: use bg-surface-gray-1 for desktop sidebar background (backport #2376)#2378
mergify[bot] wants to merge 3 commits into
main-hotfixfrom
mergify/bp/main-hotfix/pr-2376

Conversation

@mergify

@mergify mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fix: use bg-surface-gray-1 for desktop sidebar background

Problem

The desktop layout sidebar uses bg-surface-sidebar for its background. In
frappe-ui's design token system (tailwind/generated/colors.json), the dark
mode value for surface.sidebar is mapped to neutral/transparent
(#ffffff00), which means the sidebar renders with a fully transparent
background in dark mode — visually broken.

Light mode is unaffected (surface.sidebar = gray-50 there).

Fix

Replace bg-surface-sidebarbg-surface-gray-1 in DesktopLayout.vue.
surface.gray-1 correctly resolves to gray-50 in light mode and gray-900
in dark mode, providing the intended sidebar background in both themes.

Note: This is a temporary workaround. The root cause is upstream in
frappe-uisurface.sidebar in dark mode is set to transparent in
the generated color tokens, which appears to be unintentional. A separate
issue has been filed in frappe/frappe-ui to fix the token value. Once
resolved and frappe-ui is updated as a dependency, this workaround can
be reverted.

Affected file

  • frontend/src/components/Layouts/DesktopLayout.vue

Fixes #2348


This is an automatic backport of pull request #2376 done by Mergify.

Asim Delvi added 3 commits June 29, 2026 22:38
(cherry picked from commit 98b0a04)

# Conflicts:
#	frontend/src/components/Layouts/DesktopLayout.vue
(cherry picked from commit d9a84e7)

# Conflicts:
#	frontend/src/components/Layouts/DesktopLayout.vue
…ktop, mobile, and settings layouts

(cherry picked from commit e520346)

# Conflicts:
#	frontend/src/components/Layouts/DesktopLayout.vue
#	frontend/src/components/Mobile/MobileSidebar.vue
#	frontend/src/components/Settings/Settings.vue
@mergify mergify Bot added the conflicts label Jun 29, 2026
@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 98b0a04 has failed:

On branch mergify/bp/main-hotfix/pr-2376
Your branch is up to date with 'origin/main-hotfix'.

You are currently cherry-picking commit 98b0a04a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Layouts/DesktopLayout.vue

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d9a84e7 has failed:

On branch mergify/bp/main-hotfix/pr-2376
Your branch is ahead of 'origin/main-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d9a84e70.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Layouts/DesktopLayout.vue

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e520346 has failed:

On branch mergify/bp/main-hotfix/pr-2376
Your branch is ahead of 'origin/main-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e520346c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Layouts/DesktopLayout.vue
	both modified:   frontend/src/components/Mobile/MobileSidebar.vue
	both modified:   frontend/src/components/Settings/Settings.vue

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify

mergify Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@mergify mergify Bot removed the conflicts label Jun 29, 2026
@shahzeelahmed

Copy link
Copy Markdown
Member

will need to check why mergify removed conflicts label even tho theres conflicts

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.

1 participant