From: Rob Crittenden Date: Wed, 2 Sep 2015 20:12:29 +0000 (-0400) Subject: Build and ship CSS for SP Portal X-Git-Tag: v1.1.0~15 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=acea808ce4de80636d51afdeb5d509f098867dbc Build and ship CSS for SP Portal https://fedorahosted.org/ipsilon/ticket/148 Signed-off-by: Rob Crittenden Reviewed-by: Patrick Uiterwijk --- diff --git a/Makefile b/Makefile index ec3ce47..b90cd66 100644 --- a/Makefile +++ b/Makefile @@ -64,9 +64,11 @@ ui-node: less/ipsilon.less less/admin.less #lessc --clean-css less/ipsilon.less ui/css/ipsilon.css #lessc --clean-css less/admin.less ui/css/admin.css - #FIXME: temporarily disable clean-css fo deveopment + # FIXME: temporarily disable clean-css for development lessc less/ipsilon.less ui/css/ipsilon.css lessc less/admin.less ui/css/admin.css + lessc less/styles.less ui/css/styles.css + lessc less/patternfly/patternfly.less ui/css/patternfly.css clean: rm -fr testdir cscope.out diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec index 6b6742c..0c8bf68 100644 --- a/contrib/fedora/ipsilon.spec +++ b/contrib/fedora/ipsilon.spec @@ -321,6 +321,7 @@ fi %{_datadir}/ipsilon/ui/img %{_datadir}/ipsilon/ui/js %{_datadir}/ipsilon/ui/fonts +%{_datadir}/ipsilon/ui/fonts-local %{_libexecdir}/ipsilon %dir %attr(0751,root,root) %{_sharedstatedir}/ipsilon %dir %attr(0751,root,root) %{_sysconfdir}/ipsilon diff --git a/setup.py b/setup.py index eec94e9..67efa8e 100755 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ setup( (DATA+'ui/css', glob('ui/css/*.css')), (DATA+'ui/img', glob('ui/img/*')), (DATA+'ui/js', glob('ui/js/*.js')), + (DATA+'ui/fonts-local', glob('ui/fonts-local/*')), (DATA+'ui/saml2sp', glob('ui/saml2sp/*.html')), (DATA+'templates', glob('templates/*.html')), (DATA+'templates/admin', glob('templates/admin/*.html')),