Skip to content

Commit c847809

Browse files
jurokapsiarJuraj Kapsiar
andauthored
Add new brand ramp version (#34900)
Co-authored-by: Juraj Kapsiar <jukapsia@microsoft.com>
1 parent 81b397f commit c847809

15 files changed

+96
-6
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Add new brand ramp version",
4+
"packageName": "@fluentui/react-storybook-addon",
5+
"email": "jukapsia@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Add new brand ramp version",
4+
"packageName": "@fluentui/react-theme",
5+
"email": "jukapsia@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Brand ramp update",
4+
"packageName": "@fluentui/tokens",
5+
"email": "jukapsia@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

packages/react-components/react-storybook-addon/etc/react-storybook-addon.api.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ export const themes: readonly [{
7272
}, {
7373
readonly id: "teams-dark";
7474
readonly label: "Teams Dark";
75+
}, {
76+
readonly id: "teams-light-v21";
77+
readonly label: "Teams Light V2.1";
78+
}, {
79+
readonly id: "teams-dark-v21";
80+
readonly label: "Teams Dark V2.1";
7581
}, {
7682
readonly id: "teams-high-contrast";
7783
readonly label: "Teams High Contrast";

packages/react-components/react-storybook-addon/src/decorators/withFluentProvider.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import { FluentProvider } from '@fluentui/react-provider';
44
import {
55
Theme,
66
teamsDarkTheme,
7+
teamsDarkV21Theme,
78
teamsHighContrastTheme,
89
teamsLightTheme,
10+
teamsLightV21Theme,
911
webDarkTheme,
1012
webLightTheme,
1113
} from '@fluentui/react-theme';
@@ -20,6 +22,8 @@ const themes: Record<ThemeIds, Theme> = {
2022
'teams-light': teamsLightTheme,
2123
'teams-dark': teamsDarkTheme,
2224
'teams-high-contrast': teamsHighContrastTheme,
25+
'teams-light-v21': teamsLightV21Theme,
26+
'teams-dark-v21': teamsDarkV21Theme,
2327
} as const;
2428

2529
const findTheme = (themeId?: ThemeIds) => {

packages/react-components/react-storybook-addon/src/theme.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ export const themes = [
33
{ id: 'web-dark', label: 'Web Dark' },
44
{ id: 'teams-light', label: 'Teams Light' },
55
{ id: 'teams-dark', label: 'Teams Dark' },
6+
{ id: 'teams-light-v21', label: 'Teams Light V2.1' },
7+
{ id: 'teams-dark-v21', label: 'Teams Dark V2.1' },
68
{ id: 'teams-high-contrast', label: 'Teams High Contrast' },
79
] as const;
810

packages/react-components/react-theme/library/etc/react-theme.api.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ import { ShadowTokens } from '@fluentui/tokens';
6161
import { SpacingTokens } from '@fluentui/tokens';
6262
import { StrokeWidthTokens } from '@fluentui/tokens';
6363
import { teamsDarkTheme } from '@fluentui/tokens';
64+
import { teamsDarkV21Theme } from '@fluentui/tokens';
6465
import { teamsHighContrastTheme } from '@fluentui/tokens';
6566
import { teamsLightTheme } from '@fluentui/tokens';
67+
import { teamsLightV21Theme } from '@fluentui/tokens';
6668
import { Theme } from '@fluentui/tokens';
6769
import { themeToTokensObject } from '@fluentui/tokens';
6870
import { tokens } from '@fluentui/tokens';
@@ -187,10 +189,14 @@ export { StrokeWidthTokens }
187189

188190
export { teamsDarkTheme }
189191

192+
export { teamsDarkV21Theme }
193+
190194
export { teamsHighContrastTheme }
191195

192196
export { teamsLightTheme }
193197

198+
export { teamsLightV21Theme }
199+
194200
export { Theme }
195201

196202
export { themeToTokensObject }

packages/react-components/react-theme/library/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
export {
22
teamsDarkTheme,
3+
teamsDarkV21Theme,
34
teamsHighContrastTheme,
45
teamsLightTheme,
6+
teamsLightV21Theme,
57
webDarkTheme,
68
webLightTheme,
79
createDarkTheme,

packages/tokens/etc/tokens.api.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,12 +442,18 @@ export type StrokeWidthTokens = {
442442
// @public (undocumented)
443443
export const teamsDarkTheme: Theme;
444444

445+
// @public (undocumented)
446+
export const teamsDarkV21Theme: Theme;
447+
445448
// @public (undocumented)
446449
export const teamsHighContrastTheme: Theme;
447450

448451
// @public (undocumented)
449452
export const teamsLightTheme: Theme;
450453

454+
// @public (undocumented)
455+
export const teamsLightV21Theme: Theme;
456+
451457
// @public (undocumented)
452458
export type Theme = FontSizeTokens & LineHeightTokens & BorderRadiusTokens & StrokeWidthTokens & HorizontalSpacingTokens & VerticalSpacingTokens & DurationTokens & CurveTokens & ShadowTokens & ShadowBrandTokens & FontFamilyTokens & FontWeightTokens & ColorPaletteTokens & ColorStatusTokens & ColorTokens & ZIndexTokens;
453459

packages/tokens/src/global/brandColors.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,22 @@ export const brandOffice: BrandVariants = {
5656
150: `#f4beaa`,
5757
160: `#f9dcd1`,
5858
};
59+
60+
export const brandTeamsV21: BrandVariants = {
61+
10: `#29274f`,
62+
20: `#2f2a5e`,
63+
30: `#352e70`,
64+
40: `#3b3185`,
65+
50: `#44359e`,
66+
60: `#4d3aba`,
67+
70: `#5a40db`,
68+
80: `#654cf5`,
69+
90: `#7769fa`,
70+
100: `#887dff`,
71+
110: `#9791ff`,
72+
120: `#aba8ff`,
73+
130: `#bab8ff`,
74+
140: `#c8c7ff`,
75+
150: `#dcdbff`,
76+
160: `#e8e8ff`,
77+
};

0 commit comments

Comments
 (0)