From 4038bd70d2b48e68c5b897a98198d18f9e6da79e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:52 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/templates/zshare/codemirror/index.scss |   48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/templates/zshare/codemirror/index.scss b/src/templates/zshare/codemirror/index.scss
index 2ee7018..1cf9614 100644
--- a/src/templates/zshare/codemirror/index.scss
+++ b/src/templates/zshare/codemirror/index.scss
@@ -29,7 +29,7 @@
   }
   .anticon-fullscreen-exit {
     position: fixed;
-    z-index: 11;
+    z-index: 13;
     right: 10px;
     top: 5px;
     font-size: 20px;
@@ -37,6 +37,7 @@
     color: #1890ff;
     cursor: pointer;
     transition: opacity 0.3s;
+    display: none;
   }
   .anticon-fullscreen-exit:hover {
     opacity: 1;
@@ -45,7 +46,7 @@
     position: fixed;
     z-index: 11;
     right: 10px;
-    top: 40px;
+    top: 65px;
     font-size: 20px;
     opacity: 0.7;
     color: #1890ff;
@@ -65,7 +66,7 @@
     .CodeMirror-fullscreen.CodeMirror {
       border-radius: 0;
       position: fixed;
-      z-index: 10;
+      z-index: 12;
     }
     .CodeMirror-linenumber {
       font-size: 14px;
@@ -87,6 +88,47 @@
       background: #f5f5f5;
     }
   }
+  .anticon-swap {
+    position: absolute;
+    left: -25px;
+    top: 40px;
+    color: #13c2c2;
+    font-size: 16px;
+  }
+}
+.code-mirror-wrap.mk-fullscreen {
+  .anticon-format-painter {
+    position: fixed;
+    z-index: 11;
+  }
+  .anticon-fullscreen-exit {
+    display: inline-block;
+  }
+  .anticon-font-size {
+    z-index: 13;
+  }
+  .anticon-fullscreen {
+    display: none;
+  }
+
+  .anticon-swap {
+    position: fixed;
+    z-index: 11;
+    left: auto;
+    right: 10px;
+    top: auto;
+    bottom: 20px;
+  }
+}
+.model-custom-scripts-modal .code-mirror-wrap:not(.mk-fullscreen), .model-custom-view-scripts-modal .code-mirror-wrap:not(.mk-fullscreen) {
+  .anticon-swap {
+    position: absolute;
+    z-index: 11;
+    left: auto;
+    right: 10px;
+    top: auto;
+    bottom: 20px;
+  }
 }
 .mk-mirror-font {
   z-index: 1200!important;

--
Gitblit v1.8.0