search

jaunesarmiento / fries

Fries helps you prototype Android apps using HTML, CSS, and JavaScript.
MIT License
1.55k stars 222 forks source link

Merged theme branches and examples #90

Closed eyecatchup closed 10 years ago

eyecatchup commented 10 years ago

For those interested, I created a new development branch off of the current master AND themes/holo-light branches, merged the dist, lib and example files and fixed some minor JS errors.

You can check it out here. (@jaunesarmiento In case you'd like to merge holo light and dark themes into one branch too, Ill send you another pull request you can merge. Otherwise, just ditch the PR.)

eyecatchup commented 10 years ago

Added PR #91

jaunesarmiento commented 10 years ago

Let's put this on development branch first. I'll set develop as the default branch so we can merge these without affecting the latest stable release. Also, I'll be creating a branch for version 2.1 with a list of features. I'm planning to add both holo dark and light themes to that as well.

jaunesarmiento commented 10 years ago

Closing this for now.

eyecatchup commented 10 years ago

Let's put this on development branch first.

Yeah, that's what I did in my fork too. Sorry, that's my fault. Didn't wanted tor create the PR to be merged into master but rather into a new branch.

I'll set develop as the default branch

:+1:

so we can merge these without affecting the latest stable release.

Well, that's actually what tags are for, isn't it? Even though current master can be considered stable (and shouldn't be default for adding new commits (except for urgent fixes) anyway), I thought the lastest stable is 2.0.3? ;-)

(BTW, I noticed that you link to the https://github.com/jaunesarmiento/fries/archive/master.zip in the readme file rather than to https://github.com/jaunesarmiento/fries/archive/2.0.3.zip (=latest stable). Is that on purpose?)

Also, I'll be creating a branch for version 2.1 with a list of features. I'm planning to add both holo dark and light themes to that as well.

:+1:

eyecatchup commented 10 years ago

@jaunesarmiento Would you merge my changes from PR #91 into the new develop branch? If so, I can send you a new PR now. In case you don't, note it contains some JS fixes too. You may still want to merge these changes, even though you don't want to merge themes atm.

jaunesarmiento commented 10 years ago

Well, that's actually what tags are for, isn't it? Even though current master can be considered stable (and shouldn't be default for adding new commits (except for urgent fixes) anyway), I thought the lastest stable is 2.0.3? ;-)

Oh, right. Haha. Good to have someone who points out my mistakes. :)

(BTW, I noticed that you link to the https://github.com/jaunesarmiento/fries/archive/master.zip in the readme file rather than to https://github.com/jaunesarmiento/fries/archive/2.0.3.zip (=latest stable). Is that on purpose?)

Yes, I noticed that. It's my fault. It's supposed to be pointed to 2.0.3. :P

jaunesarmiento commented 10 years ago

Would you merge my changes from PR #91 into the new develop branch? If so, I can send you a new PR now. In case you don't, note it contains some JS fixes too. You may still want to merge these changes, even though you don't want to merge themes atm.

Send a PR to wip/v2.1.0. I'll merge it right away.

eyecatchup commented 10 years ago

here you go: #93

eyecatchup commented 10 years ago

closing this one