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

Conversation

@turt2live
Copy link
Member

turt2live commented Sep 14, 2017

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

This comment has been minimized.

Copy link
@t3chguy

t3chguy Sep 14, 2017

Collaborator

should this not be some SCSS Var?

This comment has been minimized.

Copy link
@turt2live

turt2live Sep 14, 2017

Author Member

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.

This comment has been minimized.

Copy link
@ara4n

ara4n Oct 14, 2017

Member

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

This comment has been minimized.

Copy link
Member

ara4n commented Oct 14, 2017

lgtm, thanks!

@ara4n ara4n merged commit 5c1e2a8 into vector-im:develop Oct 14, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ara4n

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member Author

turt2live commented Oct 14, 2017

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

@ara4n

This comment has been minimized.

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
Projects
None yet
3 participants
You can’t perform that action at this time.