Explorar o código

style: adjust email template font & padding

M1Screw %!s(int64=2) %!d(string=hai) anos
pai
achega
9da4113c55

+ 18 - 18
composer.lock

@@ -123,16 +123,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.269.3",
+            "version": "3.269.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0be880140b9fe48f67fcbf5f1ed19a1d08116369"
+                "reference": "1f9661f019cb4173e527f0c30fdd6efe190a413e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0be880140b9fe48f67fcbf5f1ed19a1d08116369",
-                "reference": "0be880140b9fe48f67fcbf5f1ed19a1d08116369",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1f9661f019cb4173e527f0c30fdd6efe190a413e",
+                "reference": "1f9661f019cb4173e527f0c30fdd6efe190a413e",
                 "shasum": ""
             },
             "require": {
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.269.3"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.269.4"
             },
-            "time": "2023-05-01T18:21:53+00:00"
+            "time": "2023-05-02T18:22:12+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2796,16 +2796,16 @@
         },
         {
             "name": "php-http/discovery",
-            "version": "1.17.0",
+            "version": "1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/discovery.git",
-                "reference": "bd810d15957cf165230e65d9e1a130793265e3b7"
+                "reference": "29ae6fae35f4116bbfe4c8b96ccc3f687eb07cd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/discovery/zipball/bd810d15957cf165230e65d9e1a130793265e3b7",
-                "reference": "bd810d15957cf165230e65d9e1a130793265e3b7",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/29ae6fae35f4116bbfe4c8b96ccc3f687eb07cd9",
+                "reference": "29ae6fae35f4116bbfe4c8b96ccc3f687eb07cd9",
                 "shasum": ""
             },
             "require": {
@@ -2868,9 +2868,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/discovery/issues",
-                "source": "https://github.com/php-http/discovery/tree/1.17.0"
+                "source": "https://github.com/php-http/discovery/tree/1.18.0"
             },
-            "time": "2023-04-26T15:39:13+00:00"
+            "time": "2023-05-03T14:49:12+00:00"
         },
         {
             "name": "php-http/guzzle7-adapter",
@@ -4303,16 +4303,16 @@
         },
         {
             "name": "sentry/sentry",
-            "version": "3.17.0",
+            "version": "3.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "95d2e932383cf684f77acff0d2a5aef5ad2f1933"
+                "reference": "2041f2ed3f82a55eaca31079e106c8b17c89dbda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/95d2e932383cf684f77acff0d2a5aef5ad2f1933",
-                "reference": "95d2e932383cf684f77acff0d2a5aef5ad2f1933",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/2041f2ed3f82a55eaca31079e106c8b17c89dbda",
+                "reference": "2041f2ed3f82a55eaca31079e106c8b17c89dbda",
                 "shasum": ""
             },
             "require": {
@@ -4391,7 +4391,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/3.17.0"
+                "source": "https://github.com/getsentry/sentry-php/tree/3.18.0"
             },
             "funding": [
                 {
@@ -4403,7 +4403,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-03-26T21:54:06+00:00"
+            "time": "2023-05-03T10:21:22+00:00"
         },
         {
             "name": "slim/http",

+ 4 - 5
resources/email/finance.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     {$title}
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     {$text}
                                 </p>
                             </div>
@@ -39,7 +38,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 4 - 5
resources/email/new_user.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     账户已经生成
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     {$text}
                                 </p>
                             </div>
@@ -39,7 +38,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 4 - 4
resources/email/password_reset.tpl

@@ -16,7 +16,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     密码重置
                                 </h2>
                             </div>
@@ -26,8 +26,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置,如果非本人申请,请忽略此邮件。<br>
                                     <a href="{$resetUrl}" style="color:#8D6CD1" target="_blank">点击此链接重置密码</a>
                                 </p>
@@ -40,7 +40,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 4 - 5
resources/email/test.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     邮件发送测试
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     这是一封测试邮件。如果你能收到,说明邮件发送配置有效,可以正常工作。
                                 </p>
                             </div>
@@ -39,7 +38,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 5 - 6
resources/email/traffic_report.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     每日流量报告
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     用户名: {$user->user_name}
                                     <br>
                                     Email: {$user->email}
@@ -41,7 +40,7 @@
                                     今日使用流量: {$lastday_traffic}
                                     <br><br>
                                 </p>
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     {$text}
                                 </p>
                             </div>
@@ -53,7 +52,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 4 - 5
resources/email/verify_code.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     邮箱验证
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     你请求的邮箱验证代码为: <b style="color:#8D6CD1">{$code}</b> <br>
                                     本验证代码在 {$expire} 前有效。<br>
                                     如果此验证码非你本人所请求,请直接忽视。<br>
@@ -41,7 +40,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>

+ 4 - 5
resources/email/warn.tpl

@@ -4,7 +4,6 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 
-    <link href="//fonts.googleapis.com/css?family=Lora" rel="stylesheet"/>
     <link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"/>
 </head>
 
@@ -16,7 +15,7 @@
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
                             <div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
-                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
+                                <h2 class="bigTitle" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:26px; font-weight:600; font-style:normal; letter-spacing:normal; line-height:34px; text-align:center; padding:0; margin:0;">
                                     系统提示
                                 </h2>
                             </div>
@@ -26,8 +25,8 @@
                 <div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
                     <div align="center" valign="top">
                         <div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
-                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:60px;padding-right:20px;" class="description">
-                                <p class="midText" style="color:#000000; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
+                            <div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
+                                <p class="midText" style="color:#000000; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:14px; font-weight:400; line-height:22px; text-align:center; padding:0; margin:0;">
                                     {$text}
                                 </p>
                             </div>
@@ -39,7 +38,7 @@
                         <div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
                             <div>
                                 <div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
-                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
+                                    <p class="smlText" style="color:#313131; font-family:'Open Sans', Tahoma, Verdana, sans-serif; font-size:11px; font-weight:400; line-height:18px; text-align:center; margin:0; padding:0;">
                                         <a href="{$config['baseUrl']}" style="color:#8D6CD1;text-decoration:none" target="_blank">{$config['appName']}</a> |
                                         <a href="{$config['baseUrl']}/user/edit" style="color:#8D6CD1;text-decoration:none" target="_blank">修改邮件接收设置</a>
                                     </p>