Skip to content

fix(site): standardize headers for Admin Settings page #16911

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.

Sign up for GitHub

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

Merged
merged 20 commits into from
Apr 1, 2025
Merged

fix(site): standardize headers for Admin Settings page #16911

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
de69ee3
fix: migrate deployment workspace proxies page to new header style
Parkreiner Mar 11, 2025
a1da1c1
fix: update other proxy page to use proper render key values
Parkreiner Mar 11, 2025
e5d581b
fix: make secondary styling more obvious
Parkreiner Mar 11, 2025
9b4928b
refactor: move SettingsHeader to Tailwind
Parkreiner Mar 11, 2025
a35a9ae
fix: resolve header level bugs
Parkreiner Mar 11, 2025
9872c5d
fix: constrain max width
Parkreiner Mar 11, 2025
1fe0022
fix: apply formatting
Parkreiner Mar 13, 2025
7d0903a
fix: update HTML semantics
Parkreiner Mar 13, 2025
a512bf5
fix: flush semantics fix
Parkreiner Mar 13, 2025
734f59d
fix: update leading
Parkreiner Mar 13, 2025
49b9dfe
fix: resolve styling edge case for beta badge
Parkreiner Mar 13, 2025
840d6df
fix: set correct font size
Parkreiner Mar 13, 2025
f169c4e
fix: remove redundant class
Parkreiner Mar 17, 2025
2325982
Merge branch 'main' into mes/headers-fix-b
Parkreiner Mar 28, 2025
99c2dbc
refactor: switch to CVA
Parkreiner Mar 28, 2025
50eddd0
refactor: update API design of SettingsHeader
Parkreiner Mar 28, 2025
2b77784
chore: add first-ever stories for SettingsHeader
Parkreiner Mar 28, 2025
e2523cb
fix: make header more responsive
Parkreiner Mar 28, 2025
7f53666
fix: format
Parkreiner Mar 28, 2025
daf6da9
fix: update beta badge styling for Notifications page
Parkreiner Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: constrain max width
  • Loading branch information
@Parkreiner
Parkreiner committed Mar 11, 2025
commit 9872c5d2b07402738cce01e20d19034a161b2c68
10 changes: 8 additions & 2 deletions site/src/components/SettingsHeader/SettingsHeader.tsx
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we add a storybook for it covering the new variants?

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ export const SettingsHeader: FC<HeaderProps> = ({
const Header = titleHeaderLevel;
return (
<div className="flex flex-row justify-between align-baseline">
<div className="max-w-prose pb-6">
{/*
* The text-sm class only adjusts the size of the description, but
* we need to apply it here so that it combines with the max-w-prose
* class and makes sure we have a predictable max width for the
* entire section of text.
*/}
<div className="text-sm max-w-prose pb-6">
<div className="flex flex-row gap-2 align-middle">
<Header
className={twMerge(
Expand All @@ -40,7 +46,7 @@ export const SettingsHeader: FC<HeaderProps> = ({
</div>

{description && (
<p className="m-0 text-sm text-content-secondary leading-relaxed">
<p className="m-0 text-content-secondary leading-relaxed">
{description}
</p>
)}
Expand Down
Loading