[PATCH conductor/gelato] Converge ui repo as git submodule... rev2

Jirka Tomasek jtomasek at redhat.com
Tue Apr 24 09:25:29 UTC 2012


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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-added-converge-ui-repo-as-git-submodule-co-vendor-co.patch
Type: text/x-patch
Size: 929 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120424/84662c39/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-changed-simlinks-layout_helper-is-now-unmodified-dis.patch
Type: text/x-patch
Size: 8287 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120424/84662c39/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-removed-converge-ui-files-from-lib.patch
Type: text/x-patch
Size: 4997436 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120424/84662c39/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-import-converge-ui-stylesheet-as-partial-to-layout.s.patch
Type: text/x-patch
Size: 2393 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120424/84662c39/attachment-0003.bin>


More information about the aeolus-devel mailing list