Skip to content

[MDL2]: Callout style fixes #75

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 6 commits into from
Aug 9, 2016
Merged

[MDL2]: Callout style fixes #75

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
de3144e
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 2, 2016
43794bd
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
b52dbc3
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
33fb294
Merge remote-tracking branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 3, 2016
56423fc
Merge branch 'OfficeDev/beta/mdl2' into beta/mdl2
Aug 4, 2016
a9039d8
fixing the example, high contrast issues, trimming
Aug 5, 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
219 changes: 88 additions & 131 deletions src/components/Callout/Callout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,65 +7,61 @@
// --------------------------------------------------
// Callout styles


$ms-Callout-commandButtonHeight: 27px;
$Callout-OOBE-title-bg: $ms-color-themePrimary;
$Callout-beak-slant-width: 28px;

.ms-Callout {
@include ms-baseFont;
width: 288px;
@include drop-shadow(0,0, 15px, -5px);
position: absolute;
display: inline-block;
border: 1px solid $ms-color-neutralLight;
z-index: $ms-zIndex-Callout;

&.is-hidden {
display: none;
@media screen and (-ms-high-contrast: active) {
border: 1px solid $ms-color-white;
}
@media screen and (-ms-high-contrast: black-on-white) {
border: 1px solid $ms-color-black;
}
}

.ms-Callout-container {
position: relative;
}

// The actual callout element
.ms-Callout-main {
position: relative;
background-color: $ms-color-white;
box-sizing: border-box;
z-index: $ms-zIndex-middle;
}

.ms-Callout-inner {
height: 100%;
padding: 0 24px 20px;
}

.ms-Callout-header {
z-index: ($ms-zIndex-Callout + $ms-zIndex-middle);
padding-top: 24px;
padding-bottom: 12px;
padding-left: 28px;
padding-right: 28px;
padding: 18px 24px 12px;
}

.ms-Callout-title {
margin: 0;
@include ms-font-xl;
font-weight: $ms-font-weight-semilight;
font-size: $ms-font-size-xl;
}

.ms-Callout-subText {
margin: 0;
@include ms-font-s;
font-weight: $ms-font-weight-semilight;
color: $ms-color-neutralPrimary;
font-size: $ms-font-size-s;
}

.ms-Callout-close {
margin: 0;
border: 0;
background: none;
cursor: pointer;
position: absolute;
top: 12px;
right: 12px;
padding: 8px;
width: 32px;
height: 32px;
font-size: 14px;
color: $ms-color-neutralSecondary;
z-index: 110;
}

.ms-Callout-link {
font-size: $ms-font-size-m;
}

.ms-Callout-inner {
height: 100%;
padding-top: 0;
padding-bottom: 12px;
padding-left: 28px;
padding-right: 28px;
@include ms-font-m;
}

.ms-Callout-actions {
Expand All @@ -74,46 +70,57 @@ $ms-Callout-commandButtonHeight: 27px;
width: 100%;
white-space: nowrap;

.ms-CommandButton.ms-CommandButton--inline {
height: $ms-Callout-commandButtonHeight;
line-height: $ms-Callout-commandButtonHeight;

.ms-CommandButton-button {
height: $ms-Callout-commandButtonHeight;
line-height: $ms-Callout-commandButtonHeight;
}

.ms-CommandButton-label {
line-height: $ms-Callout-commandButtonHeight;
}
.ms-Link.ms-Link--hero {
position: relative;
left: -8px; // Move link inline with body text
}
}

.ms-CommandButton-icon {
line-height: $ms-Callout-commandButtonHeight;
}
.ms-Callout-action {
position: relative;
top: 4px;
left: -8px;
margin-left: 0 !important;

&:hover .ms-Button,
&:focus .ms-Button {
color: $ms-color-themePrimary;
}
&:hover .ms-Callout-actionIcon,
&:focus .ms-Callout-actionIcon {
color: $ms-color-themePrimary;
}
}

.ms-Callout-button {
margin-right: 12px;
.ms-Callout-button {
margin-right: 12px;
}

//= Modifier: Close button callout
//
.ms-Callout.ms-Callout--close {
.ms-Callout-title {
margin-right: 20px; // Avoid overlap with close button
}
}


//= Modifier: OOBE (Out of box experience) callout
//
.ms-Callout.ms-Callout--OOBE {
&.ms-Callout--arrowRight,
&.ms-Callout--arrowLeft,
&.ms-Callout--arrowTop {
&:before,
&:after {
border-color: $Callout-OOBE-title-bg;
background-color: transparent;
}
}

.ms-Callout-header {
padding: 28px 24px;
background-color: $ms-color-themePrimary;
background-color: $Callout-OOBE-title-bg;
}

.ms-Callout-title {
font-weight: $ms-font-weight-light;
font-size: $ms-font-size-xxl;
@include ms-font-xxl;
color: $ms-color-white;
}

Expand All @@ -126,24 +133,35 @@ $ms-Callout-commandButtonHeight: 27px;
}
}


//= Modifier: ActionText callout
//
.ms-Callout.ms-Callout--actionText {
.ms-Callout-actions {
border-top: 1px solid $ms-color-neutralLight;
padding-top: 12px;
}

.ms-Callout-inner {
padding-bottom: 12px;
margin-bottom: -8px;
}
}


//= Modifier: Peek callout
//
.ms-Callout.ms-Callout--peek {
&.ms-Callout--arrowTop,
&.ms-Callout--arrowBottom {
&:before,
&:after {
left: 40px;
right: auto;
}
}

&.ms-Callout--arrowRight,
&.ms-Callout--arrowLeft {
&:before,
&:after {
top: calc('50% - 10px');
}
}

.ms-Callout-header {
padding-bottom: 0;
}
Expand All @@ -158,66 +176,10 @@ $ms-Callout-commandButtonHeight: 27px;
}
}


// TODO: remove overrides and scrub CSS

// slideRightIn20
@mixin ms-u-slideRightIn20 {
@include animationMix((fadeIn, slideRightIn20), $ms-duration3, $ms-ease1);
}

.ms-u-slideRightIn20 {
@include ms-u-slideRightIn20;
}
@-webkit-keyframes slideRightIn20 {
from { -webkit-transform:translate3d(-20px, 0px, 0px); }
to { -webkit-transform:translate3d(0px, 0px, 0px); }
}
@keyframes slideRightIn20 {
from { transform:translate3d(-20px, 0px, 0px); }
to { transform:translate3d(0px, 0px, 0px); }
}

// slideLeftIn20
@mixin ms-u-slideLeftIn20 {
@include animationMix((fadeIn, slideLeftIn20), $ms-duration3, $ms-ease1);
}

.ms-u-slideLeftIn20 {
@include ms-u-slideLeftIn20;
}
@-webkit-keyframes slideLeftIn20 {
from { -webkit-transform:translate3d(20px, 0px, 0px); }
to { -webkit-transform:translate3d(0px, 0px, 0px); }
}
@keyframes slideLeftIn20 {
from { transform:translate3d(20px, 0px, 0px); }
to { transform:translate3d(0px, 0px, 0px); }
}

.ms-Callout-container {
position: relative;
}

.ms-Callout {
@include ms-font-m;
@include ms-u-normalize;
@include drop-shadow(0,0, 15px, -5px);
width: auto;
border: 1px solid $ms-color-neutralLight;
position: absolute;
display: inline-block;
}

// Disabled default box shadow.
.ms-Callout-main {
box-shadow: none;
}

.ms-Callout-beak {
position: absolute;
width: 28px;
height: 28px;
width: $Callout-beak-slant-width;
height: $Callout-beak-slant-width;
background-color: $ms-color-white;
box-shadow: inherit;
border: inherit;
Expand All @@ -233,8 +195,3 @@ $ms-Callout-commandButtonHeight: 27px;
width: 16px;
height: 16px;
}

.ExampleCard-example > .ms-Callout-container > .ms-Callout {
position: relative;
}

10 changes: 0 additions & 10 deletions src/demo/pages/CalloutPage/examples/CalloutExample.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
.ms-CalloutExample {
}

.ms-CalloutExample-callout {
max-width: 300px;
}
Expand All @@ -14,7 +11,6 @@
vertical-align: top;
display: inline-block;
min-width: 130px;
top: 85px;
margin: 0 100px;
text-align: center;
height: 32px;
Expand All @@ -40,12 +36,6 @@
text-align: center;
}

.ms-CalloutExample-buttonArea .ms-Button {
top: 80px;
text-align: center;
width: 100%;
}

.ms-CalloutExample-title {
font-size: x-large;
}
Expand Down