Skip to content

[MDL2]: Dialog, Overlay fixes #52

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
atneik merged 8 commits into from
Aug 3, 2016
Merged

[MDL2]: Dialog, Overlay fixes #52

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de3144e
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 2, 2016
54ad123
Merge branch 'beta/mdl2' into anihan/mdl2/dialog
Aug 2, 2016
dc9418c
init
Aug 3, 2016
e506c81
Getting rid of z-index
Aug 3, 2016
16477b2
Rid of sibling selector
Aug 3, 2016
98aa970
Using Button component for Close button
Aug 3, 2016
2c40be2
Using semantic variables, fixing close callback
Aug 3, 2016
0d08a2b
Addressing comments
Aug 3, 2016
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
207 changes: 144 additions & 63 deletions src/components/Dialog/Dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,113 +7,194 @@
// --------------------------------------------------
// Dialog styles

$Dialog-lgHeader-backgroundColor: $ms-color-themePrimary;
$Dialog-default-min-width: 288px;
$Dialog-default-max-width: 340px;

// Mixin for IE9 specific styles
@mixin dialogPositioningIE9Fallback {
vertical-align: middle;
display: inline-block;
}

.ms-Dialog {
@include ms-baseFont;
@include drop-shadow(0, 0, 5px, 0, .4);
background-color: transparent;
position: fixed;
height: 100%;
width: 100%;
top: 0;
@include left(0);

// Fallback for IE9
display: block;
font-size: 0;
Copy link
Member

@Jahnp Jahnp Aug 3, 2016

Choose a reason for hiding this comment

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

We should consider removing this, since it will hide elements that don't have a font-size explicitly set (child elements without a font-size will inherit this size). See OfficeDev/office-ui-fabric-js#11

line-height: 100vh;
text-align: center;

// Flexbox for Modern Browsers
@include flexBox();
@include alignItems(center);

&::before {
@include dialogPositioningIE9Fallback();
content: "";
height: 100%;
width: 0;
}

.ms-Button.ms-Button--compound {
display: block;
@include margin-left(0);
}

.ms-Overlay {
@media screen and (-ms-high-contrast: active) {
opacity: 0;
}
}
}

// The actual dialog element
.ms-Dialog-main {
@include dialogPositioningIE9Fallback();
@include drop-shadow();
background-color: $ms-color-white;
box-sizing: border-box;
line-height: 1.35;
margin: auto;
width: $Dialog-default-min-width;
position: relative;
@include text-align(left);
outline: 3px solid transparent;
}

// Close button, hidden by default
.ms-Dialog-button.ms-Dialog-button--close {
display: none;
height: auto;
min-width: 220px;
max-width: 340px;
padding: 28px 24px;
z-index: $ms-zIndex-front;
position: absolute;
transform: translate(-50%, -50%);
left: 50%;
top: 50%;
@include margin-right(8px);
padding: 8px;

.ms-Icon.ms-Icon--Cancel {
color: $ms-color-neutralSecondary;
font-size: 16px;
}
}

.ms-Dialog.is-open {
display: block;
.ms-Dialog-inner {
height: 100%;
padding: 0 28px 20px;
}

.ms-Dialog-header {
position: relative;
display: table-row;
width: 100%;
box-sizing: border-box;
}

.ms-Dialog-title {
font-size: $ms-font-size-xl;
font-weight: $ms-font-weight-light;
margin-bottom: 24px;
margin: 0;
display: table-cell;
@include ms-font-xl;
padding: 20px 28px 20px;
width: 100%;
}

.ms-Dialog-topButton {
display: table-cell;
padding: 1px;
}

.ms-Dialog-content {
position: relative;
width: 100%;

// Add margin bottom between compound buttons
.ms-Button.ms-Button--compound:not(:last-child) {
Copy link
Member

@Jahnp Jahnp Aug 3, 2016

Choose a reason for hiding this comment

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

I realize this PR is a porting exercise so I won't block on this line, but as a note, we should strive to use simpler selectors for situations like this--using both :not and :last-child can be expensive for browsers to match against.

For example, this would be better broken out like this:

.ms-Button.ms-Button--compound {
  margin-bottom: 20px;

  &:last-child {
    margin-bottom: 0;
  }
}

margin-bottom: 20px;
}
}

.ms-Dialog-subText {
color: $ms-color-neutralPrimary;
font-size: $ms-font-size-s;
margin: 0 0 20px 0;
padding-top: 8px;
@include ms-font-s;
font-weight: $ms-font-weight-semilight;
line-height: 1.5;
}

.ms-Dialog-actions {
margin-top: 24px;
text-align: right;
position: relative;
width: 100%;
min-height: 24px;
line-height: 24px;
margin: 20px 0 0;
font-size: 0;

.ms-Button {
line-height: normal;
}
}

//= Modifier: Multiline button dialog
// Negative margin to needed to compensate for symmetric
// padding between action elements.
.ms-Dialog-actionsRight {
@include text-align(right);
@include margin-right(-4px);
font-size: 0;

// Reset spacing for first button
.ms-Dialog-action {
margin: 0px 4px;
}
}

//= Modifier: Dialog with close button
//
.ms-Dialog--multiline {
.ms-Dialog-title {
font-size: $ms-font-size-xxl;
.ms-Dialog.ms-Dialog--close:not(.ms-Dialog--lgHeader) {
// Show the close button
.ms-Dialog-button.ms-Dialog-button--close {
display: block;
}
}

//= Modifier: Large header dialog
//= Modifier: Multiline button dialog
//
.ms-Dialog.ms-Dialog--lgHeader {
.ms-Dialog.ms-Dialog--multiline {
.ms-Dialog-title {
background-color: $ms-color-themePrimary;
color: $ms-color-white;
font-size: $ms-font-size-xxl;
font-weight: $ms-font-weight-light;
padding: 28px 24px;
margin-top: -28px;
margin-left: -24px;
margin-right: -24px;
}
}

// Close button, hidden by default
.ms-Dialog-buttonClose {
background: none;
border: 0;
cursor: pointer;
margin: 0;
padding: 4px;
position: absolute;
right: 12px;
top: 12px;
z-index: $ms-zIndex-front;

.ms-Icon.ms-Icon--Cancel {
color: $ms-color-neutralSecondary;
font-size: 16px;
.ms-Dialog-inner {
padding: 0 20px 20px;
}
}

// Add margin bottom between compound buttons
.ms-Button.ms-Button--compound:not(:last-child) {
margin-bottom: 20px;
}

//= Modifier: Dialog with close button
//= Modifier: Large header dialog
//
.ms-Dialog.ms-Dialog--close:not(.ms-Dialog--lgHeader) {
// Push the right side over so the icon doesn't overlap the text
.ms-Dialog.ms-Dialog--lgHeader {
.ms-Dialog-header {
background-color: $Dialog-lgHeader-backgroundColor;
}

.ms-Dialog-title {
margin-right: 20px;
@include ms-font-xxl;
color: $ms-color-white;
padding: 26px 28px 28px;
margin-bottom: 8px;
}

// Show the close button
.ms-Dialog-button.ms-Dialog-buttonClose {
display: block;
.ms-Dialog-subText {
font-size: $ms-font-size-m;
}
}

@media (min-width: $ms-screen-md-min) {
// Allow wider dialog on larger screens
.ms-Dialog-main {
width: auto;
min-width: 288px;
max-width: 340px;
min-width: $Dialog-default-min-width;
max-width: $Dialog-default-max-width;
}
}
}
16 changes: 11 additions & 5 deletions src/components/Dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { FocusTrapZone } from '../FocusTrapZone/index';
import { IDialogProps, DialogType } from './Dialog.Props';
import { Overlay } from '../../Overlay';
import { Layer } from '../../Layer';
import { Button, ButtonType } from '../../Button';
import { DialogFooter } from './DialogFooter';
import { css } from '../../utilities/css';
import { Popup } from '../Popup/index';
Expand Down Expand Up @@ -72,13 +73,18 @@ export class Dialog extends React.Component<IDialogProps, any> {
ignoreExternalFocusing={ ignoreExternalFocusing }
forceFocusInsideTrap={ forceFocusInsideTrap }
firstFocusableSelector={ firstFocusableSelector }>
<button className='ms-Dialog-button ms-Dialog-button--close'
onClick={ onDismiss }
aria-label= { closeButtonAriaLabel }>
<i className='ms-Icon ms-Icon--Cancel'></i>
</button>
<div className='ms-Dialog-header'>
<p className='ms-Dialog-title' id={ id + '-title'}>{ title }</p>
<div className='ms-Dialog-topButton'>
<Button
className='ms-Dialog-button ms-Dialog-button--close'
buttonType={ ButtonType.icon }
icon='Cancel'
title={ closeButtonAriaLabel }
ariaLabel={ closeButtonAriaLabel }
onClick={ onDismiss }
/>
</div>
</div>
<div className='ms-Dialog-inner'>
<div className={ css('ms-Dialog-content', this.props.contentClassName) }>
Expand Down
1 change: 0 additions & 1 deletion src/components/Overlay/Overlay.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
left: 0;
right: 0;
top: 0;
z-index: $ms-zIndex-Overlay;

//== Modifier: Hidden overlay
//
Expand Down