Skip to content

Commit 7bb065d

Browse files
authored
Merge branch 'master' into docs/deprecate-unstable-rfc
2 parents 18847a5 + 57dfcfa commit 7bb065d

File tree

596 files changed

+12260
-3887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

596 files changed

+12260
-3887
lines changed

apps/public-docsite-v9/src/shims/ThemeShim/v9ThemeShim.ts

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
2424
colorNeutralForeground2BrandHover: palette.themePrimary,
2525
colorNeutralForeground2BrandPressed: palette.themeDarkAlt,
2626
colorNeutralForeground2BrandSelected: palette.themePrimary,
27-
colorNeutralForeground3: palette.neutralTertiary,
27+
colorNeutralForeground3: inverted ? palette.neutralSecondaryAlt : palette.neutralTertiary,
2828
colorNeutralForeground3Hover: palette.neutralSecondary,
2929
colorNeutralForeground3Pressed: palette.neutralSecondary,
3030
colorNeutralForeground3Selected: palette.neutralSecondary,
3131
colorNeutralForeground3BrandHover: palette.themePrimary,
3232
colorNeutralForeground3BrandPressed: palette.themeDarkAlt,
3333
colorNeutralForeground3BrandSelected: palette.themePrimary,
34-
colorNeutralForeground4: palette.neutralQuaternary,
34+
colorNeutralForeground4: inverted ? palette.neutralSecondaryAlt : palette.neutralQuaternary,
35+
colorNeutralForeground5: inverted ? grey[68] : grey[38],
36+
colorNeutralForeground5Hover: inverted ? '#ffffff' : grey[14],
37+
colorNeutralForeground5Pressed: inverted ? '#ffffff' : grey[14],
38+
colorNeutralForeground5Selected: inverted ? '#ffffff' : grey[14],
3539
colorNeutralForegroundDisabled: palette.neutralTertiaryAlt,
3640
colorNeutralForegroundInvertedDisabled: whiteAlpha[40],
3741
colorBrandForegroundLink: palette.themeDarkAlt,
@@ -89,8 +93,16 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
8993
colorNeutralBackground5Pressed: palette.neutralLighter,
9094
colorNeutralBackground5Selected: palette.neutralLighterAlt,
9195
colorNeutralBackground6: palette.neutralLight,
96+
colorNeutralBackground7: '#00000000',
97+
colorNeutralBackground7Hover: inverted ? grey[10] : grey[92],
98+
colorNeutralBackground7Pressed: inverted ? grey[4] : grey[84],
99+
colorNeutralBackground7Selected: '#00000000',
100+
colorNeutralBackground8: inverted ? '#ffffff' : grey[98],
92101
colorNeutralBackgroundStatic: grey[20],
93102
colorNeutralBackgroundInverted: palette.neutralSecondary,
103+
colorNeutralBackgroundInvertedHover: inverted ? grey[96] : grey[24],
104+
colorNeutralBackgroundInvertedPressed: inverted ? grey[88] : grey[12],
105+
colorNeutralBackgroundInvertedSelected: inverted ? grey[92] : grey[22],
94106
colorNeutralBackgroundAlpha: inverted ? grey10Alpha[50] : whiteAlpha[50],
95107
colorNeutralBackgroundAlpha2: inverted ? grey12Alpha[70] : whiteAlpha[80],
96108
colorSubtleBackground: 'transparent',
@@ -109,6 +121,7 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
109121
colorTransparentBackgroundPressed: 'transparent',
110122
colorTransparentBackgroundSelected: 'transparent',
111123
colorNeutralBackgroundDisabled: palette.neutralLighter,
124+
colorNeutralBackgroundDisabled2: inverted ? grey[16] : '#ffffff',
112125
colorNeutralBackgroundInvertedDisabled: whiteAlpha[10],
113126
colorNeutralStencil1: palette.neutralLight,
114127
colorNeutralStencil2: palette.neutralLighterAlt,
@@ -148,6 +161,10 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
148161
colorNeutralStroke1Selected: palette.neutralTertiaryAlt,
149162
colorNeutralStroke2: palette.neutralQuaternaryAlt,
150163
colorNeutralStroke3: palette.neutralLighter,
164+
colorNeutralStroke4: inverted ? grey[24] : grey[92],
165+
colorNeutralStroke4Hover: inverted ? grey[18] : grey[88],
166+
colorNeutralStroke4Pressed: inverted ? grey[14] : grey[84],
167+
colorNeutralStroke4Selected: inverted ? grey[24] : grey[92],
151168
colorNeutralStrokeSubtle: palette.neutralQuaternaryAlt,
152169
colorNeutralStrokeOnBrand: palette.white,
153170
colorNeutralStrokeOnBrand2: palette.white,
@@ -163,6 +180,7 @@ const mapAliasColors = (palette: IPalette, inverted: boolean): ColorTokens => {
163180
colorCompoundBrandStrokeHover: palette.themeDarkAlt,
164181
colorCompoundBrandStrokePressed: palette.themeDark,
165182
colorNeutralStrokeDisabled: palette.neutralQuaternaryAlt,
183+
colorNeutralStrokeDisabled2: inverted ? grey[24] : grey[92],
166184
colorNeutralStrokeInvertedDisabled: whiteAlpha[40],
167185
colorTransparentStroke: 'transparent',
168186
colorTransparentStrokeInteractive: 'transparent',

change/@fluentui-api-docs-43426168-a744-4dca-9652-10771141c98b.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-azure-themes-ed338bbb-1259-4166-b2bf-32d95ac71765.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-chart-utilities-e53758cf-e5e7-4ef4-8cf5-9b35c8c20d0f.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-codemods-a400d2a8-ba85-44d5-99a9-f60e452ce08b.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-common-styles-d33be1c7-d421-425d-9db7-c1f1a3385b66.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-cra-template-987869d0-b57e-4838-a85c-1dcbd3cc7de0.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-date-time-utilities-dbd34fd7-1d24-4caa-8ba2-f7df03bdeb86.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-dom-utilities-32820fbb-6ca1-4209-8601-a6773884d623.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

change/@fluentui-example-data-d1f8e225-afbc-4d9e-9ba6-775677b909b5.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)