diff --git a/components/topbar/src/application-drawer.styles.ts b/components/topbar/src/application-drawer.styles.ts index 1a8d6503..805bdd37 100644 --- a/components/topbar/src/application-drawer.styles.ts +++ b/components/topbar/src/application-drawer.styles.ts @@ -1,5 +1,7 @@ import { makeStyles, shorthands, tokens } from "@fluentui/react-components"; +const triggerSpacingWithGroup = tokens.spacingHorizontalS; + export const useApplicationDrawrStyles = makeStyles({ drawer: { ...shorthands.borderRight(0), @@ -48,6 +50,10 @@ export const useApplicationDrawrStyles = makeStyles({ ...shorthands.gap(tokens.spacingHorizontalS), ...shorthands.padding(tokens.spacingVerticalXS, tokens.spacingHorizontalM), }, + drawerTriggerApplicationWithGroup: { + ...shorthands.gap(triggerSpacingWithGroup), + ...shorthands.padding(tokens.spacingVerticalXS, triggerSpacingWithGroup), + }, drawerTriggerApplicationIcon: { display: "flex", color: tokens.colorNeutralForeground2, @@ -61,6 +67,18 @@ export const useApplicationDrawrStyles = makeStyles({ drawerTriggerApplicationText: { color: tokens.colorNeutralForeground2, }, + drawerTriggerTextWithGroup: { + marginLeft: triggerSpacingWithGroup, + color: tokens.colorNeutralForeground2, + }, + triggerDividerWithGroup: { + ...shorthands.border("0.5px", "solid", tokens.colorNeutralForeground2), + ...shorthands.borderRadius("1px"), + height: "12px", + boxSizing: "border-box", + marginTop: "1px", + marginLeft: triggerSpacingWithGroup, + }, applicationGroupTitle: { display: "flex", alignItems: "center", diff --git a/components/topbar/src/application-drawer.tsx b/components/topbar/src/application-drawer.tsx index d66ba724..d01e19bb 100644 --- a/components/topbar/src/application-drawer.tsx +++ b/components/topbar/src/application-drawer.tsx @@ -49,10 +49,25 @@ const DrawerTrigger = ( onMouseLeave={() => setHover(false)} > {} - + {currentSelection?.triggerGroupShortName + ? ( + <> + + {currentSelection?.triggerGroupShortName} + +
+ + ) + : } {currentSelection ? ( -
+
{ icon: , label: "Fisk", id: "fisk", + triggerGroupShortName: "FISH", }, { icon: , @@ -98,6 +99,7 @@ export const Navbar = () => { label: "Add", triggerLabel: "ADD trigger", id: "add", + triggerGroupShortName: "ADD", }, ];