Skip to content

Commit 2130b8a

Browse files
Edwin ChanEdwin Chan
authored andcommitted
Polish settings header and borders
1 parent 527007a commit 2130b8a

2 files changed

Lines changed: 34 additions & 9 deletions

File tree

app/globals.css

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12819,10 +12819,10 @@ html:is(.light, .dark) .settings-avatar-section,
1281912819
html:is(.light, .dark) .settings-row,
1282012820
html:is(.light, .dark) .settings-toggle-row,
1282112821
html:is(.light, .dark) .theme-choice {
12822-
border: 0;
12823-
border-radius: 0;
12824-
background: transparent;
12825-
box-shadow: none;
12822+
border: 0 !important;
12823+
border-radius: 0 !important;
12824+
background: transparent !important;
12825+
box-shadow: none !important;
1282612826
}
1282712827

1282812828
.settings-card {
@@ -12834,6 +12834,18 @@ html:is(.light, .dark) .theme-choice {
1283412834
padding: 0 0 1.5rem;
1283512835
}
1283612836

12837+
.settings-header-actions {
12838+
display: flex;
12839+
align-items: center;
12840+
justify-content: flex-end;
12841+
gap: 10px;
12842+
flex-wrap: wrap;
12843+
}
12844+
12845+
.settings-save-header {
12846+
min-height: 44px;
12847+
}
12848+
1283712849
.settings-tabs {
1283812850
display: inline-flex;
1283912851
align-items: stretch;
@@ -13024,6 +13036,15 @@ html:is(.light, .dark) .theme-choice {
1302413036
}
1302513037

1302613038
@media (max-width: 720px) {
13039+
.settings-header-actions {
13040+
width: 100%;
13041+
justify-content: flex-start;
13042+
}
13043+
13044+
.settings-header-actions > * {
13045+
flex: 1 1 auto;
13046+
}
13047+
1302713048
.settings-tabs {
1302813049
display: flex;
1302913050
width: 100%;

app/settings/page.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,15 @@ export default function SettingsPage() {
238238
<p className="eyebrow">Account</p>
239239
<h1>Settings</h1>
240240
</div>
241-
<PageBackLink destination="Dashboard" href="/dashboard" />
241+
<div className="settings-header-actions">
242+
{activeTab === "account" ? (
243+
<button className="primary-action settings-save-header" onClick={handleSave} disabled={saving}>
244+
{saving ? <MathCurveLoader size={16} label="Saving settings" /> : <Save size={16} />}
245+
{saving ? "Saving…" : "Save"}
246+
</button>
247+
) : null}
248+
<PageBackLink destination="Dashboard" href="/dashboard" />
249+
</div>
242250
</header>
243251

244252
<div className="settings-tabs" role="tablist" aria-label="Settings sections">
@@ -536,10 +544,6 @@ export default function SettingsPage() {
536544
</div>
537545
)}
538546

539-
<button className="primary-action settings-save" onClick={handleSave} disabled={saving}>
540-
{saving ? <MathCurveLoader size={16} label="Saving settings" /> : <Save size={16} />}
541-
{saving ? "Saving…" : "Save"}
542-
</button>
543547
</div>
544548
</section> : null}
545549
</main>

0 commit comments

Comments
 (0)