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

Dev build #242

Merged
merged 4 commits into from
Oct 27, 2016
Merged

Dev build #242

merged 4 commits into from
Oct 27, 2016

Conversation

Praseetha-KR
Copy link
Contributor

Implementation for #239 😄

In summary,

gulp: starts dev server, watch & do compilations to .dev folder

in master:
gulp build: does compilation, files are generated in the respective folders
gulp server: starts server in root to view compiled files after master build

(I removed compiled files of Amaro filter which is currently unavailable. Also did reset for Kelvin filter is_done status, it had got reset in one of the previous commits. Sorry to keep it in the same PR.)

@una
Copy link
Owner

una commented Oct 21, 2016

Such a good update -- I think a few files got in there accidentally!

@Praseetha-KR
Copy link
Contributor Author

There are few issues with current master:

  • Amaro filter doesn't have SCSS file, though CSS files are existing
  • Kelvin filter is done, but commit 410f2c3 has reset its is_done status to false

So the last commit in this PR c38b629 is a cleanup for those:

  • removed Amaro CSS files
  • made Kelvin's is_done = true

That is why those files are there. Sorry to mix up everything together! 😓
Should I revert that commit from this PR?

@Praseetha-KR
Copy link
Contributor Author

Hi @una,

I have reverted that commit (c38b629) from this PR. (since fd02556 already have added missing Kelvin).

Now it is clean :)

@@ -92,7 +92,7 @@
},
{
"name": "Kelvin",
"is_done": false,
"is_done": true,
Copy link
Owner

Choose a reason for hiding this comment

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

Can you remove this file from the PR?

@@ -1,38 +0,0 @@
/*
*
Copy link
Owner

Choose a reason for hiding this comment

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

This file too got in here somehow!

@una
Copy link
Owner

una commented Oct 27, 2016

Yay! Awesome!

@una una merged commit d11fdda into una:master Oct 27, 2016
@Praseetha-KR Praseetha-KR deleted the dev-build branch October 28, 2016 02:31
@Praseetha-KR Praseetha-KR mentioned this pull request Oct 28, 2016
This was referenced Nov 3, 2016
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.

2 participants