Skip to content
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.

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

Bring back dark theme code block border #5037

Merged
merged 1 commit into from
Oct 14, 2017
Merged

Bring back dark theme code block border #5037

merged 1 commit into from
Oct 14, 2017

Conversation

turt2live
Copy link
Member

This fixes #5013 and #4416 by only showing the border when the code block is hovered, and that the border is actually visible. The !important is needed to override the default border behaviour.

This fixes #5013 and #4416 by only showing the border when the code block is hovered, and that the border is actually visible. The !important is needed to override the default border behaviour.

Signed-off-by: Travis Ralston <travpc@gmail.com>
@@ -131,6 +131,9 @@ $progressbar-color: #000;
}

// markdown overrides:
.mx_EventTile_content .markdown-body pre:hover {
border-color: #808080 !important; // inverted due to rules below
Copy link
Member

Choose a reason for hiding this comment

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

should this not be some SCSS Var?

Copy link
Member Author

Choose a reason for hiding this comment

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

Possibly. I'm not sure what the guidelines are for this, as it's an override from the base, but intentionally doesn't affect the light theme.

Copy link
Member

Choose a reason for hiding this comment

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

this is a bit of a grey area (hah) - in this instance given all the other stuff nearby are hardcoded for now i'm happy to let it slip.

@ara4n
Copy link
Member

ara4n commented Oct 14, 2017

lgtm, thanks!

@ara4n ara4n merged commit 5c1e2a8 into element-hq:develop Oct 14, 2017
@ara4n
Copy link
Member

ara4n commented Oct 14, 2017

that said, i'm a bit worried that we've ended up with #e5e5e5 hardcoded into the _EventTile.scss as well as this override... it'd have been better to have a border-color SCSS variable which is just set to the right thing for dark or light theme respectively.

@turt2live
Copy link
Member Author

/me makes mental note to open a maintenance PR in that respect

@ara4n
Copy link
Member

ara4n commented Oct 14, 2017

(since when did GFM automatically put swatches next to hex colors?! #ff0000)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Border on code blocks disappeared
3 participants