Skip to content
2 changes: 1 addition & 1 deletion src/common/_semanticColorVariables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$focusedBorderColor: $ms-color-neutralSecondaryAlt;
$focusedBorderColor: $ms-color-neutralSecondary;

$bodyBackgroundColor: $ms-color-white;
$bodyForegroundColor: $ms-color-neutralPrimary;
Expand Down
11 changes: 9 additions & 2 deletions src/components/ContextualMenu/ContextualMenu.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import '../../common/common';

$ContextualMenu-background: $ms-color-white;
$ContextualMenu-itemHover: $ms-color-neutralLight;
$ContextualMenu-itemHover: $ms-color-neutralLighter;
$ContextualMenu-expandedItemBackground: $ms-color-neutralQuaternaryAlt;
$ContextualMenu-itemHeight: 40px;
$ContextualMenu-itemHeight: 36px;
$ContextualMenu-iconWidth: 24px;

.ms-ContextualMenu {
Expand Down Expand Up @@ -40,15 +40,22 @@ $ContextualMenu-iconWidth: 24px;
height: $ContextualMenu-itemHeight;
line-height: $ContextualMenu-itemHeight;
display: block;
cursor: pointer;
@include text-align(left);

&:hover:not([disabled]) {
background: $ContextualMenu-itemHover;
}

.is-focusVisible &:focus {
background: $ContextualMenu-itemHover;
}

&.is-expanded,
&.is-expanded:hover {
background: $ContextualMenu-expandedItemBackground;
color: $ms-color-black;
font-weight: $ms-font-weight-semibold;
}
}

Expand Down
27 changes: 17 additions & 10 deletions src/components/Dropdown/Dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
// --------------------------------------------------
// Dropdown styles

$Dropdown-selectedItem-bg: $ms-color-neutralQuaternaryAlt;
$Dropdown-selectedItem-hover-bg: $ms-color-neutralLighter;

// Mixin for high contrast mode link states
@mixin highContrastListItemState {
@media screen and (-ms-high-contrast: active) {
Expand All @@ -27,12 +30,9 @@
}

.ms-Dropdown {
@include ms-baseFont;
@include ms-u-normalize;
color: $ms-color-neutralPrimary;
@include ms-font-m;

font-size: $ms-font-size-m;
font-weight: $ms-font-weight-regular;
margin-bottom: 10px;
position: relative;
outline: 0;
Expand All @@ -50,7 +50,7 @@
&:hover,
&:active {
.ms-Dropdown-title {
border-color: $ms-color-neutralSecondaryAlt;
border-color: $ms-color-themePrimary;
}
}

Expand Down Expand Up @@ -205,15 +205,20 @@
}

&:hover {
background-color: $ms-color-neutralLight;
background-color: $Dropdown-selectedItem-hover-bg;
color: $ms-color-black;

@include highContrastListItemState;
}

@include focus-border();

&:focus {
Copy link
Member

Choose a reason for hiding this comment

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

nit: please add a newline before

background-color: $ms-color-neutralLighter;
}

&:active {
background-color: $ms-color-neutralLight;
border-color: $ms-color-themePrimary;
background-color: $Dropdown-selectedItem-hover-bg;
color: $ms-color-black;
}

Expand All @@ -229,12 +234,14 @@
// Use .is-selected instead.
.ms-Dropdown-item.is-selected,
.ms-Dropdown-item.ms-Dropdown-item--selected {
background-color: $ms-color-themeLight;
background-color: $Dropdown-selectedItem-bg;
color: $ms-color-black;

&:hover {
background-color: $ms-color-themeLight;
background-color: $Dropdown-selectedItem-bg;
}

@include focus-border();

@include highContrastListItemState;
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,20 @@ export class ContextualMenuCheckmarksExample extends React.Component<any, IConte
[
{
key: keys[0],
icon: 'CirclePlus',
name: 'New',
canCheck: true,
isChecked: selection[keys[0]],
onClick: this._onToggleSelect
},
{
key: keys[1],
icon: 'Share',
name: 'Share',
canCheck: true,
isChecked: selection[keys[1]],
onClick: this._onToggleSelect
},
{
key: keys[2],
icon: 'CellPhone',
name: 'Mobile',
canCheck: true,
isChecked: selection[keys[2]],
Expand All @@ -69,23 +66,20 @@ export class ContextualMenuCheckmarksExample extends React.Component<any, IConte

{
key: keys[3],
icon: 'Print',
name: 'Print',
canCheck: true,
isChecked: selection[keys[3]],
onClick: this._onToggleSelect
},
{
key: keys[4],
icon: 'MusicInCollectionFill',
name: 'Music',
canCheck: true,
isChecked: selection[keys[4]],
onClick: this._onToggleSelect
},
{
key: keys[5],
icon: 'CirclePlus',
items: [
{
key: keys[6],
Expand Down