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

Resolve #218, Add One Monokai Darker theme #219

Closed
wants to merge 3 commits into from
Closed

Resolve #218, Add One Monokai Darker theme #219

wants to merge 3 commits into from

Conversation

brandonreid
Copy link

No description provided.

scss/themes/build-variants/one-monokai-darker--main.scss Outdated Show resolved Hide resolved
scss/themes/build-variants/one-monokai-darker--styles.scss Outdated Show resolved Hide resolved
scss/themes/_one-monokai-darker.scss Outdated Show resolved Hide resolved
scss/themes/_one-monokai-darker.scss Outdated Show resolved Hide resolved
scss/themes/_one-monokai-darker.scss Outdated Show resolved Hide resolved
scss/themes/_one-monokai-darker.scss Outdated Show resolved Hide resolved
@tplk
Copy link

tplk commented Apr 10, 2019

Maybe it'd be better to split the fix and addition of the new theme into two separate PRs?

@vfede vfede mentioned this pull request Apr 29, 2019
@mastermel
Copy link
Collaborator

Please only commit changes to files in the scss/ directory. For more information please see the contributing guide. Thanks! :)

@tplk
Copy link

tplk commented May 31, 2019

@mastermel shouldn't you rebuild css from sources before commiting?
I think that's what has been done here.

@mastermel
Copy link
Collaborator

I believe @laCour set up this project with the intention that the css/ files be built and committed by just a few people in order to prevent conflicts. So far I think he's the only one that's done that after new changes have been merged for the scss/ directory. I could be mistaken though 😊

You'll notice this current PR is now conflicted with master because of this exact thing. Also, this part of the contributing guide is what I'm basing off of: https://github.com/laCour/slack-night-mode/blob/master/CONTRIBUTING.md#syncing-with-upstream

@vfede
Copy link

vfede commented Jun 5, 2019

#218 is now fixed by 515cdc3

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.

5 participants