Version 3.3.4

压缩与合并js与css文件，js与src原文件移至src目录下
sqlsec · Jan 29, 2016 · f9a73d7 · f9a73d7
1 parent 99da469
commit f9a73d7
Show file tree

Hide file tree

Showing 5 changed files with 6,421 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -163,7 +163,6 @@ define('MAIL_RECV', "[email protected]");//接收通知的邮件地址
 
 * static/js与static/css下的js与css文件已压缩
 * 其中`jqxcore.js、jqxdata.js、jqxgrid.js、jqxgrid.columnsresize.js、jqxgrid.filter.js、jqxgrid.edit.js、jqxgrid.pager.js、jqxgrid.selection.js、jqxgrid.sort.js、jqxbuttons.js、jqxcombobox.js、jqxdropdownlist.js、jqxinput.js、jqxlistbox.js、jqxmenu.js、jqxscrollbar.js、jqxsplitter.js、jqxtabs.js、jqxtextarea.js、jqxtoolbar.js、jqxwindow.js`合并为`jqwidgets.min.js`
-* `jqx.base.css、jqx.office.css`合并为`jqx.min.css`
 * css与js源文件移至src目录下，方便二次开发
 
 ## 特别说明

diff --git a/admin.php b/admin.php
@@ -11,13 +11,11 @@
     <title>控制面板</title>
     <link rel="stylesheet" href="static/css/bootstrap.min.css" type="text/css" />
     <link rel="stylesheet" href="static/css/main.min.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/notification.min.css" type="text/css" />
-    <link rel="stylesheet" href="static/css/jqx.min.css" type="text/css" />
+    <link rel="stylesheet" href="static/css/notification.min.css" type="text/css" />	
+	<link rel="stylesheet" href="static/css/jqx.base.css" type="text/css" />
+	<link rel="stylesheet" href="static/css/jqx.office.css" type="text/css" />
     <link rel="stylesheet" href="static/css/animate.min.css" type="text/css" />
 
-
-
-
 </head>
 
 <body>