Merge branch 'refs/heads/master' into stable

public/static/css/main.css

@@ -126,7 +126,7 @@
 
 /* Global Styles START */
 :root {
-  --color-def: #ff9216;
+  --color-def: #d97707;
   --color-2: #2B2C30;
   --color-1: #2a2832;
   --color-3: #2a1832;
@@ -1694,6 +1694,7 @@ a {
   font-size: 16px;
   text-align: right;
   line-height: 40px;
+    height: 40px;
 }
 
 .gallery-album-line a{
@@ -1736,7 +1737,7 @@ table.album_table img {
   border-radius: 5px;
 }
 table.album_table button {
-  background-color: #ccc;
+  background-color: #d97707;
   color: white;
   border: none;
   padding: 8px 12px;
@@ -1745,7 +1746,7 @@ table.album_table button {
   transition: background-color 0.3s ease;
 }
 table.album_table button:hover {
-  background-color: #777;
+  background-color: #d97707;
 }
 /* 视频遮罩层样式 */
 .overlay {

resources/views/gallery-detail.blade.php

@@ -84,6 +84,8 @@
                                 <thead>
                                 <tr>
                                     <th>图片</th>
+                                    <th>中文标题</th>
+                                    <th>英文标题</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -95,6 +97,12 @@
                                             <img src="{{ossUrl($item['cover'])}}?x-oss-process=image/resize,w_260" class="void-img">
                                         </a>
                                     </td>
+                                    <td>
+                                        {{@$item['video_title']}}
+                                    </td>
+                                    <td>
+                                        {{@$item['video_en_title']}}
+                                    </td>
                                     <td>
                                         <button data-src="{{ossUrl($item['video_src'])}}" class="video-btn">播放</button>
                                         <a href="{{ossUrl($item['video_src'])}}" download class="download-btn" target="_blank"><button>下载</button></a>

resources/views/login.blade.php

@@ -22,8 +22,8 @@
             margin-bottom: 20px; /* 调整 logo 与 login-container 的间距 */
         }
         .logo img {
-            width: 150px;
-            height: 150px;
+            width: 120px;
+            height: 120px;
         }
         .login-container {
             background-color: #fff;
@@ -33,7 +33,9 @@
             text-align: center;
         }
         .login-container h2 {
+            font-size: 16px;
             margin-bottom: 20px;
+            font-weight: normal;
         }
         .login-container input[type="text"],
         .login-container input[type="password"] {