Skip to content

Fixing ComboBox styling by reverting button classname move #4088

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
Feb 24, 2018
Merged

Fixing ComboBox styling by reverting button classname move #4088

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
14b9757
reverting the order of a registration that is causing issues.
dzearing Feb 24, 2018
915826d
Adding change file.
dzearing Feb 24, 2018
cd025e6
fixing snaps
dzearing Feb 24, 2018
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/undo-button-classname_2018-02-24-03-17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Button: reverting previous tweak to fix ComboBox dropdown selection styling.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
2 changes: 1 addition & 1 deletion ...s/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
aria-pressed={undefined}
className=
ms-Button
ms-Button--icon
ms-Breadcrumb-overflowButton
ms-Button--icon
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down
4 changes: 2 additions & 2 deletions packages/office-ui-fabric-react/src/components/Button/BaseButton.classNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const getBaseButtonClassNames = memoizeFunction((
root: [
'ms-Button',
styles.root,
className,
variantClassName,
checked && [
'is-checked',
Expand Down Expand Up @@ -71,8 +72,7 @@ export const getBaseButtonClassNames = memoizeFunction((
':hover': styles.rootCheckedHovered,
':active': styles.rootCheckedPressed
}
},
className
}
],
flexContainer: [
'ms-Button-flexContainer',
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/ComboBox/__snapshots__/ComboBox.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
checked={false}
className=
ms-Button
ms-Button--icon
ms-ComboBox-CaretDown-button
ms-Button--icon
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down
10 changes: 5 additions & 5 deletions packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ exports[`Nav renders Nav correctly 1`] = `
aria-pressed={undefined}
className=
ms-Button
ms-Nav-link
ms-Button--action
ms-Button--command
ms-Nav-link
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down Expand Up @@ -128,6 +128,10 @@ exports[`Nav renders Nav correctly 1`] = `
top: 1px;
z-index: 1;
}
.ms-Nav-compositeLink:hover & {
background-color: #f8f8f8;
color: #333333;
}
&:hover {
color: #0078d7;
}
Expand All @@ -140,10 +144,6 @@ exports[`Nav renders Nav correctly 1`] = `
&:active .ms-Button-icon {
color: #004578;
}
.ms-Nav-compositeLink:hover & {
background-color: #f8f8f8;
color: #333333;
}
data-is-focusable={true}
disabled={undefined}
onClick={[Function]}
Expand Down
6 changes: 3 additions & 3 deletions packages/office-ui-fabric-react/src/components/Pivot/__snapshots__/Pivot.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ exports[`Pivot renders Pivot correctly 1`] = `
aria-selected={true}
className=
ms-Button
ms-Button--action
ms-Button--command
ms-Pivot-link
is-selected
undefined
ms-Button--action
ms-Button--command
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down Expand Up @@ -120,9 +120,9 @@ exports[`Pivot renders Pivot correctly 1`] = `
aria-selected={false}
className=
ms-Button
ms-Pivot-link
ms-Button--action
ms-Button--command
ms-Pivot-link
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down
4 changes: 2 additions & 2 deletions ...s/office-ui-fabric-react/src/components/SpinButton/__snapshots__/SpinButton.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
checked={false}
className=
ms-Button
ms-Button--icon
ms-UpButton
ms-Button--icon
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down Expand Up @@ -259,8 +259,8 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
checked={false}
className=
ms-Button
ms-Button--icon
ms-DownButton
ms-Button--icon
{
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
Expand Down