From df9586ac7f3abd90d7b2aec871c7e6ac3d829d94 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期四, 16 五月 2024 17:46:22 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
index 957b4e8..c17681e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
@@ -3,7 +3,8 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" name="viewport" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <title>閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</title>
     <meta name="description" content="閽绘帰宸ョ▼淇℃伅鍖栫郴缁�">
     <!--[if lt IE 9]>
@@ -22,18 +23,25 @@
         }  
         html,body{
         	height: 100%;
+            touch-action: manipulation;
+        }
+        html {
+            touch-action: manipulation;
         }
         #logo-text{
-        	color: rgba(51, 51, 51, 1);
-        	font-size: 44px;
-        	margin-left: 0px;
+        	/*color: rgba(51, 51, 51, 1);*/
+        	font-size: 40px;
+        	margin-left: 25px;
+            color: white;
+            margin-bottom: 20px;
         }
         .page-con{
         	border-width: 0px;
         	margin-left: 0px;
         	/*text-align: left;*/
-        	left: 524px;
+        	left: 38%;
         	padding: 0px;
+            color: white;
         }
         .bar-line{
         	display: block;
@@ -133,5 +141,21 @@
 <script  th:src="@{/ajax/libs/encrypt/jsencrypt.min.js}"></script>
 <script  th:src="@{/loginPage/process/login.js}"></script>
 
+<script type="text/javascript">
+    window.addEventListener('wheel', function (event) {
+        if (event.ctrlKey === true || event.metaKey) {
+            event.preventDefault();
+        }
+    }, { passive: false });
+
+    //firefox
+    window.addEventListener('DOMMouseScroll', function (event) {
+        if (event.ctrlKey === true || event.metaKey) {
+            event.preventDefault();
+        }
+    }, { passive: false })
+
+</script>
+
 </body>
 </html>

--
Gitblit v1.9.1