From 08dbcb5ad90602bde3da057340bea5c1068b30b5 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Tue, 4 Jul 2006 20:43:09 +0000 Subject: [PATCH] use make rather than links, stage 2 git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@372 839d8a87-29fc-0310-9880-83ba4fa771e5 --- Makefile | 14 +++++++----- htdocs/css/banana.css | 61 --------------------------------------------------- 2 files changed, 9 insertions(+), 66 deletions(-) delete mode 100644 htdocs/css/banana.css diff --git a/Makefile b/Makefile index f30a434..df390c4 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ headers: headache -c install.d/platal-dev/templates/header.conf -h install.d/platal-dev/templates/header \ `find templates -name '*.tpl' ! -path 'templates/xnet/skin.tpl' ! -path 'templates/skin/*.tpl' ! -name 'vcard.tpl' ` -build: spool/templates_c wiki include/platal/globals.inc.php htdocs/img +build: spool/templates_c wiki include/platal/globals.inc.php banana clean: rm -rf include/platal/globals.inc.php @@ -53,9 +53,6 @@ htdocs/valid.html: htdocs/uploads: cd htdocs && ln -sf ../spool/uploads -htdocs/img: - cd htdocs && ln -sf /usr/share/banana/img - htdocs/wiki: cd htdocs && ln -sf ../wiki/pub wiki @@ -73,11 +70,18 @@ get-wiki: mv pmwiki-* wiki; \ fi +banana: htdocs/img htdocs/css/banana.css +htdocs/img: + cd $(@D) && ln -sf /usr/share/banana/img + +htdocs/css/banana.css: + cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F) + build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php ################################################################################ -.PHONY: build dist clean wiki build-wiki +.PHONY: build dist clean wiki build-wiki banana diff --git a/htdocs/css/banana.css b/htdocs/css/banana.css deleted file mode 100644 index 7535dd0..0000000 --- a/htdocs/css/banana.css +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************** -* css/style.css : Default css -* --------------- -* -* This file is part of the banana distribution -* Copyright: See COPYING files that comes with this distribution -********************************************************************************/ - -div.banana_scuts { text-align: left; padding: 0.5em 0em; } - -/** GROUP LIST **/ - -table.banana_group td.new { text-align: center; } -table.banana_group td.all { text-align: center; } -table.banana_group td.grp { text-align: left; } -table.banana_group td.dsc { text-align: left; } - -/** THREAD VIEW **/ - -table.banana_thread td { white-space: nowrap; height: 100%; vertical-align: middle; } - -table.banana_thread tr.new { font-weight: bold; } - -table.banana_thread td.date { width: 15%; text-align: center; } -table.banana_thread td.subj { text-align: left; overflow: hidden; } -table.banana_thread td.from { text-align: left; } - -table.banana_thread div.tree { float: left; padding-right: 0.3em; } -table.banana_thread span.cur { font-style: italic; font-size: 90%; } - -/** MESSAGE VIEW **/ - -table.banana_msg td.headers { width: 100%; } -table.banana_msg .hdr { width: 15%; text-align: right; font-weight: bold; padding-right: 1em; } -table.banana_msg td.xface { text-align: right; } - -table.banana_msg td.thrd { padding: 0px; } -table.banana_msg table { border: 0px; padding: 0px; margin: 0px; width: 100%; } - -table.banana_msg blockquote { - color: blue; - font-style: italic; - margin-left: 0; - padding-left: 1em; - border-left: solid 1px; - border-color: blue; -} -table.banana_msg blockquote blockquote { - color: green; - border-color: green; -} -table.banana_msg blockquote blockquote blockquote { - color: #cc0000; - border-color: #cc0000; -} - -/** MISC **/ - -div.center { text-align: center; padding: 1em; } -p.error { color: red; background: inherit; } - -- 2.1.4