Skip to content

ContextMenus: change to using semantic slots #1658

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
dzearing merged 3 commits into from
May 2, 2017
Merged

ContextMenus: change to using semantic slots #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
70bb175
Merge branch 'master' into phkuo/semanticMenus
phkuo Apr 28, 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-04-28-20-45.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": "Shifting the ContextMenu over to semantic slots for colors.",
"type": "patch"
}
],
"email": "phkuo@microsoft.com"
}
55 changes: 55 additions & 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 @@ -28,3 +28,58 @@ $selectedActiveBackgroundColor: $ms-color-neutralTertiaryAlt;
$selectedActiveForegroundColor: $ms-color-neutralPrimary;

$dividerColor: $ms-color-neutralLight;

Copy link
Copy Markdown
Contributor Author

@phkuo phkuo Apr 28, 2017

Choose a reason for hiding this comment

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

The semantic slots here are duplicated across multiple branches I'm working on, to make my life easier for later merges.

// *** New semantic slots
// todo: convert to theme tokens

/*** BASIC ***/
$bodyBackgroundColor: $ms-color-white;
$bodyTextColor: $ms-color-neutralPrimary;
$bodySubtextColor: $ms-color-neutralSecondary;

$disabledBackgroundColor: $ms-color-neutralLighter;
$disabledTextColor: $ms-color-neutralTertiary;
$disabledSubtextColor: $ms-color-neutralTertiaryAlt;

$focusBorderColor: $ms-color-black;

// $errorBackgroundColor: todo
$errorTextColor: $ms-color-redDark;

/*** Text fields ***/
$fieldBackgroundColor: $ms-color-white;
$fieldTextColor: $ms-color-neutralPrimary;

$fieldBorderColor: $ms-color-neutralTertiaryAlt;
$fieldBorderHoverColor: $ms-color-neutralSecondaryAlt;
$fieldBorderFocusColor: $ms-color-themePrimary;

$fieldPlaceholderColor: $ms-color-neutralTertiary;

/*** State controls ***/
$controlBackgroundColor: $ms-color-white;
$controlBackgroundSelectedColor: $ms-color-themePrimary;
$controlBackgroundSelectedHoverColor: $ms-color-themeSecondary;

$controlForegroundColor: $ms-color-neutralPrimary;
$controlForegroundHoverColor: $ms-color-black;
$controlForegroundSelectedColor: $ms-color-white;

$controlBorderUnselectedColor: $ms-color-neutralSecondaryAlt;
$controlBorderUnselectedHoverColor: $ms-color-black;
// $controlBorderSelectedColor: unused
$controlBorderSelectedHoverColor: $ms-color-themePrimary;

/*** Menus ***/
$menuBackgroundColor: $ms-color-white;
$menuBackgroundHoverColor: $ms-color-neutralLighter;
$menuBackgroundSelectedColor: $ms-color-neutralQuaternaryAlt;

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

$menuIconColor: $ms-color-themePrimary;

$menuHeaderColor: $ms-color-themePrimary;

$menuDividerColor: $ms-color-neutralLight;
43 changes: 29 additions & 14 deletions 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
@@ -1,13 +1,28 @@
@import '../../common/common';

$ContextualMenu-background: $ms-color-white;
$ContextualMenu-itemHover: $ms-color-neutralLighter;
$ContextualMenu-expandedItemBackground: $ms-color-neutralQuaternaryAlt;


$ContextualMenu-itemHeight: 36px;
$ContextualMenu-iconWidth: 14px;

// component slots
$ContextualMenu-background-color: $menuBackgroundColor;
$ContextualMenu-background-hover-color: $menuBackgroundHoverColor;
$ContextualMenu-background-selected-color: $menuBackgroundSelectedColor;

$ContextualMenu-text-color: $menuTextColor;
$ContextualMenu-text-selected-color: $menuTextSelectedColor;

$ContextualMenu-icon-color: $menuIconColor;

$ContextualMenu-header-color: $menuHeaderColor;

$ContextualMenu-divider-color: $menuDividerColor;

$ContextualMenu-text-disabled: $disabledTextColor;

.root {
background-color: $ContextualMenu-background;
background-color: $ContextualMenu-background-color;
min-width: 180px;
}

Expand All @@ -20,7 +35,7 @@ $ContextualMenu-iconWidth: 14px;

.item {
@include ms-font-m;
color: $ms-color-neutralPrimary;
color: $ContextualMenu-text-color;
height: $ContextualMenu-itemHeight;
position: relative;
box-sizing: border-box;
Expand All @@ -42,26 +57,26 @@ $ContextualMenu-iconWidth: 14px;
@include text-align(left);

&:hover:not([disabled]) {
background: $ContextualMenu-itemHover;
background: $ContextualMenu-background-hover-color;
}
&.isDisabled,
&[disabled] {
color: $ms-color-neutralTertiaryAlt;
color: $ContextualMenu-text-disabled;
cursor: default;
pointer-events: none;
.icon {
color: $ms-color-neutralTertiaryAlt;
color: $ContextualMenu-text-disabled;
}
}

:global(.is-focusVisible) &:focus {
background: $ContextualMenu-itemHover;
background: $ContextualMenu-background-hover-color;
}

&.isExpanded,
&.isExpanded:hover {
background: $ContextualMenu-expandedItemBackground;
color: $ms-color-black;
background: $ContextualMenu-background-selected-color;
color: $ContextualMenu-text-selected-color;
font-weight: $ms-font-weight-semibold;
}
}
Expand All @@ -70,7 +85,7 @@ $ContextualMenu-iconWidth: 14px;
@include focus-border();
@include ms-font-s;
font-weight: $ms-font-weight-semibold;
color: $ms-color-themePrimary;
color: $ContextualMenu-header-color;
background: none;
border: none;
height: $ContextualMenu-itemHeight;
Expand Down Expand Up @@ -105,7 +120,7 @@ a.link {
.divider {
display: block;
height: 1px;
background-color: $dividerColor;
background-color: $ContextualMenu-divider-color;
position: relative;
}

Expand All @@ -120,7 +135,7 @@ a.link {
}

.iconColor {
color: $ms-color-themePrimary;
color: $ContextualMenu-icon-color;
}

.itemText {
Expand Down