Skip to content

[SpinButton] Consistent styles to Button and TextField #4098

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 4 commits into from
Mar 2, 2018
Merged

[SpinButton] Consistent styles to Button and TextField #4098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39bb05d
[SpinButton] Consistent styles to Button and TextField
lambertwang-zz Feb 26, 2018
174c445
Collapsed padding properties
lambertwang-zz Feb 27, 2018
e8447f4
Update snapshot
lambertwang-zz Feb 27, 2018
03d90d3
Change file
lambertwang-zz Feb 27, 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 .../changes/office-ui-fabric-react/magellan-spinButtonConsistentStyles_2018-02-27-22-22.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": "SpinButton: Updated styling to be consistent with Button and TextField",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "law@microsoft.com"
}
61 changes: 24 additions & 37 deletions packages/office-ui-fabric-react/src/components/SpinButton/SpinButton.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,32 @@ export const getArrowButtonStyles = memoizeFunction((
customSpecificArrowStyles?: Partial<IButtonStyles>,
): IButtonStyles => {

const { palette } = theme;
const {
semanticColors
} = theme;

const ArrowButtonTextColor = palette.neutralPrimary;
const ArrowButtonTextColorPressed = palette.white;
const ArrowButtonBackgroundHovered = palette.neutralLight;
const ArrowButtonBackgroundPressed = palette.themePrimary;
const ArrowButtonTextColor = semanticColors.buttonText;
const ArrowButtonTextColorHovered = semanticColors.buttonTextHovered;
const ArrowButtonTextColorPressed = semanticColors.buttonTextChecked;

const ArrowButtonBackgroundHovered = semanticColors.buttonBackgroundHovered;
const ArrowButtonBackgroundPressed = semanticColors.buttonBackgroundChecked;
Copy link
Copy Markdown
Contributor

@phkuo phkuo Feb 27, 2018

Choose a reason for hiding this comment

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

should probably add a pressed state... but this will work for now


const defaultArrowButtonStyles: IButtonStyles = {
root: {
outline: 'none',
display: 'block',
height: '50%',
width: '14px',
paddingTop: '0',
paddingRight: '0',
paddingBottom: '0',
paddingLeft: '0',
padding: '0',
backgroundColor: 'transparent',
textAlign: 'center',
cursor: 'default',
color: ArrowButtonTextColor
},
rootHovered: {
backgroundColor: ArrowButtonBackgroundHovered
backgroundColor: ArrowButtonBackgroundHovered,
color: ArrowButtonTextColorHovered
},
rootChecked: {
backgroundColor: ArrowButtonBackgroundPressed,
Expand Down Expand Up @@ -121,12 +123,12 @@ export const getStyles = memoizeFunction((
): ISpinButtonStyles => {
const { fonts, palette, semanticColors } = theme;

const SpinButtonRootBorderColor = palette.neutralTertiaryAlt;
const SpinButtonRootBorderColorHovered = palette.neutralSecondary;
const SpinButtonRootBorderColorFocused = palette.themePrimary;
const SpinButtonRootBorderColor = semanticColors.inputBorder;
const SpinButtonRootBorderColorHovered = semanticColors.inputBorderHovered;
const SpinButtonRootBorderColorFocused = semanticColors.inputFocusBorderAlt;

const SpinButtonTextColorDisabled = palette.neutralTertiaryAlt;
const SpinButtonInputTextColor = palette.neutralPrimary;
const SpinButtonTextColorDisabled = semanticColors.disabledText;
const SpinButtonInputTextColor = semanticColors.bodyText;
const SpinButtonInputTextColorSelected = palette.white;
const SpinButtonInputBackgroundColorSelected = palette.themePrimary;

Expand All @@ -138,10 +140,7 @@ export const getStyles = memoizeFunction((
fontSize: FontSizes.medium,
width: '100%',
minWidth: '86px',
paddingTop: '2px',
paddingRight: '2px',
paddingBottom: '2px',
paddingLeft: '2px',
padding: '2px',
},
labelWrapper: {
display: 'inline-flex'
Expand All @@ -161,22 +160,15 @@ export const getStyles = memoizeFunction((
marginTop: '10px'
},
icon: {
paddingTop: '2px',
paddingRight: '5px',
paddingBottom: '2px',
paddingLeft: '5px',

padding: '2px 5px',
fontSize: '20px'
},
iconDisabled: {
color: SpinButtonIconDisabledColor
},
label: {
pointerEvents: 'none',
paddingTop: '2px',
paddingRight: '0',
paddingBottom: '2px',
paddingLeft: '0',
padding: '2px 0',
},
labelDisabled: {
cursor: 'default',
Expand All @@ -189,7 +181,8 @@ export const getStyles = memoizeFunction((
},
spinButtonWrapper: {
display: 'flex',
height: '26px',
boxSizing: 'border-box',
height: '32px',
minWidth: '86px',
borderWidth: '1px',
borderStyle: 'solid',
Expand Down Expand Up @@ -228,10 +221,7 @@ export const getStyles = memoizeFunction((
fontSize: FontSizes.medium,
color: SpinButtonInputTextColor,
height: '100%',
paddingTop: '3px',
paddingRight: '3px',
paddingBottom: '4px',
paddingLeft: '4px',
padding: '0 12px',
outline: '0',
textOverflow: 'ellipsis',
display: 'block',
Expand Down Expand Up @@ -261,10 +251,7 @@ export const getStyles = memoizeFunction((
float: 'left',
height: '100%',
cursor: 'default',
paddingTop: '0',
paddingRight: '0',
paddingBottom: '0',
paddingLeft: '0',
padding: '0',
boxSizing: 'border-box'
},
arrowButtonsContainerDisabled: _getDisabledStyles(theme),
Expand Down
27 changes: 14 additions & 13 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 @@ -57,15 +57,16 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
className=

{
border-color: #c8c8c8;
border-color: #a6a6a6;
border-style: solid;
border-width: 1px;
box-sizing: border-box;
display: flex;
height: 26px;
height: 32px;
min-width: 86px;
}
&:hover {
border-color: #666666;
border-color: #212121;
outline: 2px dashed transparent;
}
@media screen and (-ms-high-contrast: active){&:hover {
Expand Down Expand Up @@ -98,10 +99,10 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
min-width: 72px;
outline: 0;
overflow: hidden;
padding-bottom: 4px;
padding-left: 4px;
padding-right: 3px;
padding-top: 3px;
padding-bottom: 0;
padding-left: 12px;
padding-right: 12px;
padding-top: 0;
text-overflow: ellipsis;
user-select: text;
width: calc(100% - 14px);
Expand Down Expand Up @@ -198,11 +199,11 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
}
&:hover {
background-color: #eaeaea;
color: #004578;
color: #000000;
}
&:active {
background-color: #0078d7;
color: #ffffff;
background-color: #c8c8c8;
color: #212121;
}
@media screen and (-ms-high-contrast: active){&:active {
background-color: Highlight;
Expand Down Expand Up @@ -303,11 +304,11 @@ exports[`SpinButton renders SpinButton correctly 1`] = `
}
&:hover {
background-color: #eaeaea;
color: #004578;
color: #000000;
}
&:active {
background-color: #0078d7;
color: #ffffff;
background-color: #c8c8c8;
color: #212121;
}
@media screen and (-ms-high-contrast: active){&:active {
background-color: Highlight;
Expand Down