Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Move non-theme-specific inline editor styles into core. #8580

Merged
merged 2 commits into from
Jul 28, 2014

Conversation

dangoor
Copy link
Contributor

@dangoor dangoor commented Jul 28, 2014

Fix for #8571 (targeting release branch).

@larz0 can you take a look?

@mackenza does this do the trick for you?

@@ -241,6 +241,10 @@

}

.inline-widget .CodeMirror, .inline-widget .CodeMirror-gutters {
background: transparent;
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be background: transparent !important; because the other rule with "#editor-holder" has a higher specificity and can override this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could add #editor-holder to this. Is that cleaner than adding !important?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm... I don't actually see a problem from this.

@dangoor
Copy link
Contributor Author

dangoor commented Jul 28, 2014

I've pushed changes based on @larz0's comments

@larz0
Copy link
Member

larz0 commented Jul 28, 2014

@dangoor looks good. Merging.

larz0 added a commit that referenced this pull request Jul 28, 2014
Move non-theme-specific inline editor styles into core.
@larz0 larz0 merged commit 9c6affa into release Jul 28, 2014
@larz0 larz0 deleted the dangoor/8571-generic-styles branch July 28, 2014 22:03
@@ -241,6 +241,10 @@

}

#editor-holder .inline-widget .CodeMirror, #editor-holder .inline-widget .CodeMirror-gutters {
background: transparent;
Copy link
Member

Choose a reason for hiding this comment

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

Is the second selector here needed anymore? The fix for #8541 made .CodeMirror-linenumbers opaque, and afaict that covers the entire bounds of .CodeMirror-gutters. (And if it didn't, then part of #8541 would still repro, I think...)

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

@larz0 You mean looks fine with that selector removed? If it looks fine with it removed, want to submit a tiny cleanup PR to make that change? (I guess targeted at master -- no point in squeezing it onto the release branch).

Copy link
Member

Choose a reason for hiding this comment

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

Ok sounds good.

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.

3 participants