From e22001841356668c5a63f1e2bf0239ef99d6cfb6 Mon Sep 17 00:00:00 2001 From: printempw Date: Sun, 3 Apr 2016 11:28:47 +0800 Subject: [PATCH] added option of Google Fonts CDN --- admin/customize.php | 34 ++++++++++++++++++- admin/options.php | 4 +-- assets/css/admin.style.css | 3 +- assets/css/install.style.css | 4 +-- assets/css/style.css | 4 +-- assets/css/user.style.css | 3 +- .../libs/AdminLTE/dist/css/AdminLTE.min.css | 2 +- index.php | 11 +++++- templates/admin/header.tpl.php | 12 +++++++ templates/error.tpl.php | 2 +- templates/header.tpl.php | 12 +++++++ 11 files changed, 76 insertions(+), 15 deletions(-) diff --git a/admin/customize.php b/admin/customize.php index 0ba2ae36..79278c91 100644 --- a/admin/customize.php +++ b/admin/customize.php @@ -3,7 +3,7 @@ * @Author: printempw * @Date: 2016-03-19 14:34:21 * @Last Modified by: printempw - * @Last Modified time: 2016-04-03 11:00:02 + * @Last Modified time: 2016-04-03 11:27:05 */ require "../libraries/session.inc.php"; if (!$user->is_admin) Utils::redirect('../index.php?msg=看起来你并不是管理员'); @@ -96,6 +96,38 @@ $db = new Database\Database('users');
+ +
+
+

Google Font CDN

+
+
+ +
+ 设置已保存。
'; + } ?> + + + + + + +
+ +
+
+
+ +
+ +
diff --git a/admin/options.php b/admin/options.php index b33f5e73..19edb1f6 100644 --- a/admin/options.php +++ b/admin/options.php @@ -3,7 +3,7 @@ * @Author: printempw * @Date: 2016-03-18 22:50:25 * @Last Modified by: printempw - * @Last Modified time: 2016-04-03 10:17:18 + * @Last Modified time: 2016-04-03 11:12:00 */ require "../libraries/session.inc.php"; if (!$user->is_admin) Utils::redirect('../index.php?msg=看起来你并不是管理员'); @@ -85,7 +85,7 @@ $db = new Database\Database('users'); 首选 JSON API - diff --git a/assets/css/admin.style.css b/assets/css/admin.style.css index 393b9544..97de26e5 100644 --- a/assets/css/admin.style.css +++ b/assets/css/admin.style.css @@ -2,10 +2,9 @@ * @Author: printempw * @Date: 2016-02-04 16:47:54 * @Last Modified by: printempw -* @Last Modified time: 2016-03-27 10:38:36 +* @Last Modified time: 2016-04-03 11:21:29 */ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); body, .ply-layer { font-family: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; } diff --git a/assets/css/install.style.css b/assets/css/install.style.css index b11c5192..4f4e766e 100644 --- a/assets/css/install.style.css +++ b/assets/css/install.style.css @@ -2,10 +2,10 @@ * @Author: printempw * @Date: 2016-03-12 18:54:09 * @Last Modified by: printempw -* @Last Modified time: 2016-03-27 14:47:19 +* @Last Modified time: 2016-04-03 11:14:36 */ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); +@import url(https://cdn.moefont.com/fonts/css?family=Ubuntu); @import url(https://work.prinzeugen.net/font/Minecraft.css); html { diff --git a/assets/css/style.css b/assets/css/style.css index 6c0a51be..02113cc5 100755 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -2,11 +2,9 @@ * @Author: printempw * @Date: 2016-01-21 07:57:38 * @Last Modified by: printempw -* @Last Modified time: 2016-03-27 11:57:33 +* @Last Modified time: 2016-04-03 11:21:35 */ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); - @font-face { font-family: 'Minecraft'; src: url('../fonts/minecraft.eot'); diff --git a/assets/css/user.style.css b/assets/css/user.style.css index f332cc07..0f66912a 100644 --- a/assets/css/user.style.css +++ b/assets/css/user.style.css @@ -2,10 +2,9 @@ * @Author: printempw * @Date: 2016-01-21 19:12:06 * @Last Modified by: printempw -* @Last Modified time: 2016-03-27 09:40:30 +* @Last Modified time: 2016-04-03 11:21:24 */ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); body, .ply-layer { font-family: Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif; } diff --git a/assets/libs/AdminLTE/dist/css/AdminLTE.min.css b/assets/libs/AdminLTE/dist/css/AdminLTE.min.css index abb87501..396657a3 100644 --- a/assets/libs/AdminLTE/dist/css/AdminLTE.min.css +++ b/assets/libs/AdminLTE/dist/css/AdminLTE.min.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);/*! +/*! * AdminLTE v2.3.0 * Author: Almsaeed Studio * Website: Almsaeed Studio diff --git a/index.php b/index.php index be0937e9..c70a8352 100755 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * @Author: printempw * @Date: 2016-01-17 13:55:20 * @Last Modified by: printempw - * @Last Modified time: 2016-04-03 10:53:41 + * @Last Modified time: 2016-04-03 11:21:56 */ session_start(); $dir = dirname(__FILE__); @@ -34,6 +34,15 @@ if (isset($_COOKIE['uname']) && isset($_COOKIE['token'])) { + + + + + + + + + diff --git a/templates/error.tpl.php b/templates/error.tpl.php index 934e0180..2aca964f 100644 --- a/templates/error.tpl.php +++ b/templates/error.tpl.php @@ -5,7 +5,7 @@ 出现错误 - Blessing Skin Server - + diff --git a/templates/header.tpl.php b/templates/header.tpl.php index 2183570d..f154791a 100644 --- a/templates/header.tpl.php +++ b/templates/header.tpl.php @@ -10,6 +10,18 @@ + + + + + + + + + + + +