Skip to content

Commit a9b6897

Browse files
committed
chore: add beta badge to organizations subheader
1 parent ebc5397 commit a9b6897

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
"stretchr",
121121
"STTY",
122122
"stuntest",
123+
"subpage",
123124
"tailbroker",
124125
"tailcfg",
125126
"tailexchange",

site/src/components/FeatureBadge/FeatureBadge.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const styles = {
3434

3535
cursor: "default",
3636
flexShrink: 0,
37+
alignSelf: "baseline",
3738
padding: "4px 8px",
3839
lineHeight: 1,
3940
whiteSpace: "nowrap",

site/src/pages/ManagementSettingsPage/SidebarView.tsx

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import type {
77
Experiments,
88
Organization,
99
} from "api/typesGenerated";
10+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
1011
import { Loader } from "components/Loader/Loader";
1112
import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";
1213
import { Stack } from "components/Stack/Stack";
@@ -47,7 +48,10 @@ export const SidebarView: FC<SidebarProps> = ({
4748
// TODO: Do something nice to scroll to the active org.
4849
return (
4950
<BaseSidebar>
50-
<header css={styles.sidebarHeader}>Deployment</header>
51+
<header>
52+
<h2 css={styles.sidebarHeader}>Deployment</h2>
53+
</header>
54+
5155
<DeploymentSettingsNavigation
5256
active={!activeOrganizationName && activeSettings}
5357
experiments={experiments}
@@ -190,7 +194,18 @@ const OrganizationsSettingsNavigation: FC<
190194

191195
return (
192196
<>
193-
<header css={styles.sidebarHeader}>Organizations</header>
197+
<header
198+
css={{
199+
display: "flex",
200+
flexFlow: "row wrap",
201+
columnGap: "8px",
202+
alignItems: "baseline",
203+
}}
204+
>
205+
<h2 css={styles.sidebarHeader}>Organizations</h2>
206+
<FeatureBadge type="beta" variant="static" size="sm" />
207+
</header>
208+
194209
{permissions.createOrganization && (
195210
<SidebarNavItem
196211
active="auto"
@@ -364,7 +379,8 @@ const SidebarNavSubItem: FC<SidebarNavSubItemProps> = ({
364379
const styles = {
365380
sidebarHeader: {
366381
textTransform: "uppercase",
367-
letterSpacing: "0.15em",
382+
letterSpacing: "0.1em",
383+
margin: 0,
368384
fontSize: 11,
369385
fontWeight: 500,
370386
paddingBottom: 4,

0 commit comments

Comments
 (0)