From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/styles/divforms/panoramaBox.scss | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/styles/divforms/panoramaBox.scss b/src/styles/divforms/panoramaBox.scss
index ca23a0e..5eb065e 100644
--- a/src/styles/divforms/panoramaBox.scss
+++ b/src/styles/divforms/panoramaBox.scss
@@ -1,3 +1,5 @@
+
+
.panorama-dom {
position: fixed;
left: 0;
@@ -8,6 +10,8 @@
overflow: hidden;
padding: 30px;
+
+
.content-wrap {
padding: 0 20px 20px 20px;
@@ -15,12 +19,26 @@
border: 1px solid #29baf1;
box-shadow: 0 0px 12px #29b8f1e5;
+ box-sizing: border-box;
+
.title {
position: relative;
height: 36px;
line-height: 36px;
color: #fff;
text-align: center;
+
+ .full-srceen-btn {
+ position: absolute;
+ top: 0;
+ right: 34px;
+ bottom: 0;
+ left: auto;
+ margin: auto;
+ width: 18px;
+ height: 18px;
+ cursor: pointer;
+ }
.close-box {
position: absolute;
@@ -39,6 +57,7 @@
position: relative;
min-width: 460px;
min-height: 320px;
+ height: calc(100% - 36px);
button {
padding: 2px;
@@ -79,6 +98,28 @@
transform: rotate(-45deg) translate(5px, -15px);
background-color: #28bbf0;
}
+
+ .change-full {
+ position: fixed !important;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 99;
+ background: #fff;
+ transform: translate3d(0, 0, 0) !important;
+ }
+
+ &.change-full {
+ position: fixed !important;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ transform: translate3d(0, 0, 0) !important;
+ z-index: 22 !important;
+ }
}
.monitor-dom {
--
Gitblit v1.9.3