瀏覽代碼

Merge pull request #1564 from Anankke/feat-bump-smaty-3.x-to-4.x

Feat bump smarty 3.x to 4.x
M1Screw 3 年之前
父節點
當前提交
3f41d2789d

+ 1 - 1
composer.json

@@ -23,7 +23,7 @@
         "sendgrid/sendgrid": "^7",
         "sentry/sentry": "^3",
         "slim/slim": "~3.0",
-        "smarty/smarty": "^3",
+        "smarty/smarty": "^4",
         "stripe/stripe-php": "^7.105",
         "symfony/yaml": "^5",
         "voku/anti-xss": "^4",

+ 2 - 2
public/theme/material/css/base.css

@@ -6267,8 +6267,8 @@ html.no-touchevents .tile-action-show,html.no-touchevents .tile:hover .tile-acti
 .cardbtn-edit a.btn-flat.btn-brand-accent.reset-link i {
 	font-size: 30px;
 	position: relative;
-	top: 2px;
-	right: 4px;
+	top: 0.2em;
+	right: 0.15em;
 }
 
 .cardbtn-edit a.btn-flat.btn-brand-accent.reset-link {

文件差異過大導致無法顯示
+ 0 - 0
public/theme/material/css/base.min.css


+ 2 - 2
resources/views/material/user/edit.tpl

@@ -35,7 +35,7 @@
 							<div class="card-inner">
 								<div class="cardbtn-edit">
 									<div class="card-heading">重置订阅链接</div>
-                                    <button class="btn btn-flat" id="url_reset"><span class="mdi mdi-autorenew">autorenew</span>&nbsp;</button>
+                                    <button class="btn btn-flat" id="url_reset"><span class="mdi mdi-autorenew"></span>&nbsp;</button>
 								</div>
                                 <p>点击会重置您的订阅链接,您需要更新客户端中所配置的订阅地址方可继续使用。</p>
 							</div>
@@ -399,7 +399,7 @@
                                     <div class="cardbtn-edit">
                                         <div class="card-heading">Telegram 绑定</div>
                                     {if $user->telegram_id != 0}
-                                        <button class="btn btn-brand-accent btn-flat" id="telegram_reset"><span class="mdi mdi-block-helper"></span>&nbsp;</button>
+                                        <button class="btn btn-flat" id="telegram_reset"><span class="mdi mdi-block-helper"></span>&nbsp;</button>
                                     </div>
                                         <div class="text-center">
                                             <p>当前绑定的 Telegram 账户:<a href="https://t.me/{$user->im_value}">@{$user->im_value}</a></p>

部分文件因文件數量過多而無法顯示