Skip to content

ContextMenu: give disabled text its own slot #1682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
micahgodbolt merged 8 commits into from
May 3, 2017
Merged

ContextMenu: give disabled text its own slot #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
005b25f
semantic slot-ify context menus
phkuo Apr 28, 2017
c3a486a
add rush change file
phkuo Apr 28, 2017
15fcd14
Merge branch 'master' into phkuo/semanticMenus
phkuo Apr 28, 2017
fa138f7
Merge branch 'master' into phkuo/semanticMenus
phkuo May 2, 2017
b3c0f70
fix potential bug
phkuo May 2, 2017
9af8872
add rush change file
phkuo May 2, 2017
5e30811
remove old rush change file
phkuo May 2, 2017
cf3c93f
Merge branch 'master' into phkuo/semanticMenus
phkuo May 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/changes/phkuo-semanticMenus_2017-05-02-22-02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "ContextMenu: fix a potential bug. All foreground colors need to be slots in the same category because the category has its own background color, in order to insure accessibility.",
"type": "patch"
}
],
"email": "phkuo@microsoft.com"
}
1 change: 1 addition & 0 deletions packages/office-ui-fabric-react/src/common/_semanticColorVariables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ $menuBackgroundSelectedColor: $ms-color-neutralQuaternaryAlt;

$menuTextColor: $ms-color-neutralPrimary;
$menuTextSelectedColor: $ms-color-black;
$menuTextDisabledColor: $ms-color-neutralTertiaryAlt;

$menuIconColor: $ms-color-themePrimary;

Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $ContextualMenu-header-color: $menuHeaderColor;

$ContextualMenu-divider-color: $menuDividerColor;

$ContextualMenu-text-disabled: $disabledTextColor;
$ContextualMenu-text-disabled: $menuTextDisabledColor;
Copy link
Copy Markdown
Member

@micahgodbolt micahgodbolt May 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changing the color from $ms-color-neutralTertiary to $ms-color-neutralTertiaryAlt, is that purposeful?

Copy link
Copy Markdown
Contributor Author

@phkuo phkuo May 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it aligns with what I have in other files
(and we'll have to design review it soon anyways)


.root {
background-color: $ContextualMenu-background-color;
Expand Down