This patchset adds converge-ui as git submodule into vendor/converge-ui. Beware Git cant delete the submodule folder when switching to branch without that submodule. so the submodule folder remains there as untracked.
Git am has some problem with applying the 0003 patch, so please use git am for the first 2, then git apply 0003 and commit it and then git am the 0004.
It is necessary to run 'git submodule init' and 'git submodule update' after applying the patches. Otherwise the submodule won't be present and rails will complain about missing files as the simlinks won't work.
Patchset also prepares gelato branch to step by step incorporating the converge-ui layout, stylesheets and javascripts with conductor.
I am also working on more cleanups of stylesheets in master branch, which aim to remove unused stylesheets and introduce stylesheets structure similar to converge-ui (fonts, mixins, reset, header, layout...) to make the transfer even easier. Partial cleanup will follow.
Jirka
On Tue, Apr 24, 2012 at 11:25:29AM +0200, Jirka Tomasek wrote:
This patchset adds converge-ui as git submodule into vendor/converge-ui. Beware Git cant delete the submodule folder when switching to branch without that submodule. so the submodule folder remains there as untracked.
Git am has some problem with applying the 0003 patch, so please use git am for the first 2, then git apply 0003 and commit it and then git am the 0004.
It is necessary to run 'git submodule init' and 'git submodule update' after applying the patches. Otherwise the submodule won't be present and rails will complain about missing files as the simlinks won't work.
Patchset also prepares gelato branch to step by step incorporating the converge-ui layout, stylesheets and javascripts with conductor.
I am also working on more cleanups of stylesheets in master branch, which aim to remove unused stylesheets and introduce stylesheets structure similar to converge-ui (fonts, mixins, reset, header, layout...) to make the transfer even easier. Partial cleanup will follow.
As we discussed on IRC, I could not get this revised patchset to apply, either -- the 3rd still claims to not be applicable. But after it was pushed to a "gelato_reorder" branch, I was able to pull that and everything worked.
Everything there looks good, so ACK.
-- Matt
aeolus-devel@lists.fedorahosted.org