From 97f125b3b4a30625061385ceedc7e72b3e30dd55 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 29 Nov 2019 13:15:21 +0800 Subject: [PATCH] * change for merge xuanxuan. --- Makefile | 1 + .../admin/ext/css/xuanxuan/xuanxuan.css | 2 +- .../www/data/xuanxuan/zentao-integrated.zip | Bin 98048 -> 98452 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 25d145623c..873d9c9844 100644 --- a/Makefile +++ b/Makefile @@ -118,6 +118,7 @@ zentaoxx: sed -i 's/footer.html.php/footer.lite.html.php/g' zentaoxx/module/common/view/footer.modal.html.php sed -i 's/getAppRoot/getModuleRoot/g' zentaoxx/module/common/view/footer.modal.html.php sed -i 's/v\.//g' zentaoxx/module/im/js/debug.js + sed -i 's/helper::jsonEncode(/json_encode(/g' zentaoxx/framework/xuanxuan.class.php sed -i "s/lang->goback,/lang->goback, '',/g" zentaoxx/module/im/view/debug.html.php sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql diff --git a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css index 0f6e8c6fff..f8048c6999 100644 --- a/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css +++ b/xuanxuan/module/admin/ext/css/xuanxuan/xuanxuan.css @@ -12,4 +12,4 @@ display: table-cell;float: none;vertical-align: top;} .statusBlock .date h2{font-size:18px;font-weight:500;} .statusBlock .server a{padding-top:3px;padding-bottom:3px; background: linear-gradient(#ffffff, #ecf4ff);color:#477cf9;} .statisticsBlock .col{height:100px;text-align:center;padding-top:20px;} -.statisticsBlock .col h2{font-size:30px;font-weight:500;} +.statisticsBlock .col h2{font-size:18px;font-weight:500;} diff --git a/xuanxuan/www/data/xuanxuan/zentao-integrated.zip b/xuanxuan/www/data/xuanxuan/zentao-integrated.zip index 0afd5dfa609a460a4002d54c9f98ee55bba6aad6..2210ae50476a55bf6c389def44708129c743d8b2 100644 GIT binary patch delta 5344 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 CJDMH< delta 4936 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 hP%I{U7w=|2gx4004FWj^UH>uA{{a@X4&eX*