Skip to content

Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon #4835

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
kenotron merged 6 commits into from
Jun 5, 2018
Merged

Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon #4835

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aa37b9
Fix selectors in TeachingBubble.scss. Add Primary and Secondary butt…
edwlmsft May 10, 2018
8223333
Add onDismiss to example
edwlmsft May 10, 2018
356456b
Remove unused import
edwlmsft May 10, 2018
0d5f6c5
Add change file
edwlmsft May 10, 2018
d2d5137
Fix missing semis
edwlmsft May 10, 2018
64540b4
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
edwlmsft Jun 4, 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/coachmarkSCSSFixes_2018-05-10-19-12.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": "Update Coachmark basic example and fix TeachingBubble SCSS selectors",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "edwl@microsoft.com"
}
14 changes: 13 additions & 1 deletion ...ages/office-ui-fabric-react/src/components/Coachmark/examples/Coachmark.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { Coachmark } from '../Coachmark';
import { TeachingBubbleContent } from 'office-ui-fabric-react/lib/TeachingBubble';
import { ICalloutProps } from 'office-ui-fabric-react/lib/Callout';
import { DefaultButton } from 'office-ui-fabric-react/lib/Button';
import { DefaultButton, IButtonProps } from 'office-ui-fabric-react/lib/Button';
import { IStyle } from '../../../Styling';
import {
BaseComponent,
Expand Down Expand Up @@ -60,6 +60,14 @@ export class CoachmarkBasicExample extends BaseComponent<{}, ICoachmarkBasicExam
};
});

const primaryButtonProps: IButtonProps = {
text: 'OK'
};

const secondaryButtonProps: IButtonProps = {
text: 'Cancel'
};

return (
<div className={ classNames.root }>
<div
Expand All @@ -78,6 +86,10 @@ export class CoachmarkBasicExample extends BaseComponent<{}, ICoachmarkBasicExam
<TeachingBubbleContent
headline='Example Title'
calloutProps={ calloutProps }
hasCloseIcon={ true }
primaryButtonProps={ primaryButtonProps }
secondaryButtonProps={ secondaryButtonProps }
onDismiss={ this._onCalloutDismiss }
>
Welcome to the land of coachmarks
</TeachingBubbleContent>
Expand Down
10 changes: 7 additions & 3 deletions packages/office-ui-fabric-react/src/components/TeachingBubble/TeachingBubble.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,16 @@
font-weight: $ms-font-weight-semilight;
}

.root .closeButton {
.closeButton {
position: absolute;
@include ms-right(0);
top: 0;
color: $ms-color-white;
font-size: $ms-icon-size-s;

&:hover {
background: transparent;
}
}

.footer {
Expand Down Expand Up @@ -155,7 +159,7 @@
}

//Primary button style override
.root .primaryButton {
.primaryButton {

@dzearing dzearing May 15, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

removing specificity here could cause issues.

@micahgodbolt micahgodbolt May 31, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

agreed...i'm guessing these styles are overriding previous styles...probably applied via a classname, so any change in load order could break this.

@micahgodbolt micahgodbolt May 31, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If you want to simplify this, you could pass the styles into the button styles prop

background-color: $ms-color-white;
border-color: $ms-color-white;

Expand All @@ -181,7 +185,7 @@
}

//Secondary button style override
.root .secondaryButton {
.secondaryButton {
background-color: $ms-color-themePrimary;
border-color: $ms-color-white;

Expand Down