Skip to content

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

Merged
kenotron merged 6 commits intomicrosoft:masterfrom
leddie24:coachmarkSCSSFixes
Jun 5, 2018
Merged

Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon#4835
kenotron merged 6 commits intomicrosoft:masterfrom
leddie24:coachmarkSCSSFixes

Conversation

@leddie24
Copy link
Copy Markdown
Collaborator

Pull request checklist

Description of changes

Updates SCSS selectors to properly show teaching bubble close icon and primary/secondary button styles.

Old:
old-coachmark

New:
new-coachmark

I'm working on a separate PR for a lot of positioning fixes with Coachmark/TeachingBubble that will fix the cut off. It will be a big PR, so I wanted to separate this small style change in this PR first.

Focus areas to test

(optional)

@leddie24 leddie24 requested a review from micahgodbolt as a code owner May 10, 2018 19:11
@leddie24 leddie24 requested review from aditima and kkjeer May 10, 2018 19:12
@JasonGore
Copy link
Copy Markdown
Member

Can you add a basic Coachmark snapshot test (from master before your PR), switch to your branch (with new test and snapshot present), then confirm the differences in the snapshot introduced by your PR make sense? Thanks


//Primary button style override
.root .primaryButton {
.primaryButton {
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.

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.

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

…c-react into coachmarkSCSSFixes

# Conflicts:
#	packages/office-ui-fabric-react/src/components/Coachmark/examples/Coachmark.Basic.Example.tsx
#	packages/office-ui-fabric-react/src/components/TeachingBubble/TeachingBubble.scss
@kenotron kenotron merged commit 3a3be6d into microsoft:master Jun 5, 2018
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Jun 6, 2018
* master:
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Jun 6, 2018
* master:
  Charting (microsoft#4954)
  Deprecation lint rule! (microsoft#5109)
  Implement selection for selected items list (microsoft#5036)
  Ignore common/changes and don't prettify json files (microsoft#5112)
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Jun 6, 2018
* master: (31 commits)
  Charting (microsoft#4954)
  Deprecation lint rule! (microsoft#5109)
  Implement selection for selected items list (microsoft#5036)
  Ignore common/changes and don't prettify json files (microsoft#5112)
  Part 2 of demo page refactor (microsoft#5089)
  Update jest.js
  fixing official example page and datepicker/calendar components using… (microsoft#5108)
  Don't run prettier and tslint in parallel as it might cause conflicts (microsoft#5100)
  FocusTrapZone - restore last focused descendant element (microsoft#5103)
  Coachmark/TeachingBubble: Fix SCSS selectors for buttons and Close Icon (microsoft#4835)
  HoverCard: IE11 fix (microsoft#5105)
  FocusTrapZone bug allows breaking out of the trap (microsoft#4898)
  Applying package updates.
  Update ISSUE_TEMPLATE.md
  Experiment/Nav component: hide nav group header if all the links under it are hidden (microsoft#5095)
  Add optional prop to not dismiss Callout on focus loss (microsoft#5092)
  Experiments: moves ShimmerTile from Shimmer to Tile. (microsoft#5090)
  Run jest in parallel on Windows (microsoft#5096)
  Applying package updates.
  Major bump jest-serializer-merge-styles
  ...
@microsoft microsoft locked as resolved and limited conversation to collaborators Aug 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Teaching Bubble close icon on hover

6 participants