Skip to content

Changing toggle styles to use flex box #4313

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
phkuo merged 6 commits into from
Mar 20, 2018
Merged

Changing toggle styles to use flex box #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d50e26
Changing toggle styles to use flex box
jdrush89 Mar 19, 2018
5f3c538
Adding change request file
jdrush89 Mar 19, 2018
ff38d5e
Updating toggle snapshot
jdrush89 Mar 20, 2018
7eaaf64
Fixing style for disabled and checked toggle
jdrush89 Mar 20, 2018
5ba27a8
Adding comment
jdrush89 Mar 20, 2018
6f0235c
Removing comment
jdrush89 Mar 20, 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 ...ffice-ui-fabric-react/jdrush89-Change-Toggle-Styling-To-Use-Flexbox_2018-03-19-19-21.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": "Toggle: Updating to use flexbox positioning",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "jdrush89@gmail.com"
}
19 changes: 8 additions & 11 deletions packages/office-ui-fabric-react/src/components/Toggle/Toggle.classNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ export const getClassNames = memoizeFunction((
getFocusStyle(theme, -3),
{
fontSize: '20px',
lineHeight: '1em',
boxSizing: 'border-box',
position: 'relative',
width: '2.2em',
height: '1em',
borderRadius: '1em',
Expand All @@ -91,6 +89,9 @@ export const getClassNames = memoizeFunction((
background: pillUncheckedBackground,
borderColor: pillBorderColor,
cursor: 'pointer',
display: 'flex',
alignItems: 'center',
padding: '0 .2em'
},
styles.pill,
!disabled && [
Expand All @@ -108,7 +109,8 @@ export const getClassNames = memoizeFunction((
checked && [
{
background: pillCheckedBackground,
borderColor: 'transparent'
borderColor: 'transparent',
justifyContent: 'flex-end'
},
styles.pillChecked,
{
Expand Down Expand Up @@ -143,7 +145,8 @@ export const getClassNames = memoizeFunction((
checked && [
{
backgroundColor: pillCheckedDisabledBackground,
borderColor: 'transparent'
borderColor: 'transparent',
justifyContent: 'flex-end'
},
styles.pillCheckedDisabled
],
Expand All @@ -156,22 +159,18 @@ export const getClassNames = memoizeFunction((
width: '.5em',
height: '.5em',
borderRadius: '.5em',
position: 'absolute',
top: '.18em',
transition: 'all 0.1s ease',
backgroundColor: thumbBackground,
/* Border is added to handle high contrast mode for Firefox */
borderColor: 'transparent',
borderWidth: '.28em',
borderStyle: 'solid',
boxSizing: 'border-box',
left: '.2em'
boxSizing: 'border-box'
},
styles.thumb,
!disabled && checked && [
{
backgroundColor: thumbCheckedBackground,
left: '1.4em',
selectors: {
[HighContrastSelector]: {
backgroundColor: 'Window',
Expand All @@ -185,14 +184,12 @@ export const getClassNames = memoizeFunction((
!checked && [
{
backgroundColor: thumbDisabledBackground,
left: '.2em',
},
styles.thumbDisabled
],
checked && [
{
backgroundColor: thumbCheckedDisabledBackground,
left: '1.4em'
},
styles.thumbCheckedDisabled
]
Expand Down
10 changes: 6 additions & 4 deletions packages/office-ui-fabric-react/src/components/Toggle/__snapshots__/Toggle.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,22 @@ exports[`Toggle renders toggle correctly 1`] = `
className=
ms-Toggle-background
{
align-items: center;
background: #ffffff;
border-color: #666666;
border-radius: 1em;
border-style: solid;
border-width: 1px;
box-sizing: border-box;
cursor: pointer;
display: flex;
font-size: 20px;
height: 1em;
line-height: 1em;
outline: transparent;
padding-bottom: 0;
padding-left: .2em;
padding-right: .2em;
padding-top: 0;
position: relative;
Copy link
Copy Markdown
Contributor

@phkuo phkuo Mar 20, 2018

Choose a reason for hiding this comment

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

hmm I'm surprised this didn't get removed

transition: all 0.1s ease;
width: 2.2em;
Expand Down Expand Up @@ -98,9 +103,6 @@ exports[`Toggle renders toggle correctly 1`] = `
border-width: .28em;
box-sizing: border-box;
height: .5em;
left: .2em;
position: absolute;
top: .18em;
transition: all 0.1s ease;
width: .5em;
}
Expand Down