Skip to content
This repository was archived by the owner on Oct 17, 2025. It is now read-only.

Conversation

@mfluehr
Copy link
Contributor

@mfluehr mfluehr commented Feb 7, 2018

This includes the perspective and perspective-origin props. File names follow the suggestion in #544.

Copy link
Contributor

@wbamberg wbamberg left a comment

Choose a reason for hiding this comment

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

These look good to me @mfluehr .

I just merged #556, which removes the id="example_one" boilerplate.

Let me know if you want to update this PR before merging, otherwise I'll merge now and we can update in a follow-up.

@mfluehr
Copy link
Contributor Author

mfluehr commented Feb 8, 2018

I've deleted the IDs, but there are still conflicts, apparently. How can I resolve those?

* upstream/master:
  Adding list-style css example. (#547)
  Flex examples (#558)
  Add column examples (#549)
  Remove CSS example id attributes (#556)
  Add various text examples (#545)
  Add contribution item (#552)
  Adds @helmutgranda as contributor (#550)
  Adding border radius example with recommended changes. (#546)
  Add `quotes` example (#543)
@wbamberg
Copy link
Contributor

wbamberg commented Feb 8, 2018

@mfluehr , I merged mdn/interactive-examples back into your branch, and that seems to have done the trick.

@wbamberg wbamberg merged commit b3619de into mdn:master Feb 8, 2018
@mfluehr mfluehr deleted the perspective branch February 9, 2018 13:35
@mfluehr
Copy link
Contributor Author

mfluehr commented Feb 12, 2018

I've inserted these into their respective pages.

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.

2 participants