Repository navigation
fix(ui): plain buttons are the surface with a border, unlike a disabled box (#524) - #570
Merged
KnifeLemon merged 1 commit intoOct 25, 2026
Merged
Conversation
…nifeLemon#524) Revert, Browse… and the other plain buttons had the same flat grey as a disabled field next to them. They now take the surface they sit on with a thin border, in the app and in Setup (which shares Soft.axaml). Material You and a theme.json surface colour them too.
Collaborator
Author
|
@KnifeLemon, CI is green on every check here. When you have reviewed it, could you merge it into main? |
KnifeLemon
approved these changes
Oct 25, 2026
KnifeLemon
left a comment
Owner
There was a problem hiding this comment.
Thanks @cre8ive-marketing, this is (b) as approved in #524: plain buttons take the surface with a thin border in light and dark, Material You and theme.json surfaces follow through ThemeService, and Setup comes along since it shares Soft.axaml. The test pins the surface and border in both styles and variants. Merging.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Point 5 of #524, option (b), as approved.
What it does
Plain buttons (Revert, Browse…, Change…, Open folder …) had the same flat grey as a disabled field, such as the DPI box next to them. They now take the surface they sit on, with a thin border, so only a disabled control is a flat grey. Accent, ghost, icon and navigation buttons keep their own look.
Soft.axaml: the FluentButtonBackground*/ButtonBorderBrush*resources in the light and dark dictionaries.SurfaceBrush, soThemeServicegives the buttons the same surface and hover colour. Without that, the buttons would stay white on a tinted card.Soft.axaml, so its Change… button changes the same way.Setup (Options)
The app (from the #524 discussion)
Tests
MaterialYouThemeTests.Plain_buttons_are_the_surface_with_a_border_unlike_a_disabled_box: under Soft and Material You, light and dark, a plain button resolves to the surface, hovers to the alternate surface and has a visible border.ThemeService_respects_custom_theme_json_overridesnow also checks that a theme.json surface reaches the buttons.SetupWindowTestsscreenshots above (29 pass).dotnet format --verify-no-changesis clean.dotnet test: Platform 81, Core 602, CLI 27, Setup 176, Engines 1821 and App 1345 pass, none fail.Part of #524.