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

Merge various small vanilla updates into glitch #286

Conversation

chriswmartin
Copy link

This PR brings various small upstream front-end updates into glitch -- its probably good to make sure things don't get too out of sync.

PRs included: mastodon#5871, mastodon#5921, mastodon#6006, mastodon#6014, mastodon#6018, mastodon#6021, mastodon#6046, mastodon#6091, mastodon#6092, mastodon#6098

@@ -556,6 +556,10 @@
white-space: pre-wrap;
padding-top: 5px;

&:focus {
Copy link
Author

Choose a reason for hiding this comment

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

This is toosuite PR mastodon#5921, I accidentally forgot to put it in its own commit.

Copy link
Member

@marrus-sh marrus-sh left a comment

Choose a reason for hiding this comment

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

Thank you for doing this work!!!

@chriswmartin
Copy link
Author

of course!

@beatrix-bitrot beatrix-bitrot merged commit 7347bc7 into glitch-soc:master Dec 26, 2017
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.

None yet

3 participants