From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突
---
src/styles/common.scss | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 4507ae7..f18866b 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -19,12 +19,42 @@
//通用配置
@import './normalize.scss';
-a{
+a {
text-decoration: none;
- color:#333;
+ color: #333;
}
-*{
+
+* {
outline: none;
}
+
//滚动条样式
-@include scrollBar;
\ No newline at end of file
+@include scrollBar;
+
+
+.see-img-box {
+
+ .el-dialog {
+ width: 840px;
+ height: 540px;
+
+ .el-dialog__body {
+ padding: 4px;
+ position: relative;
+ height: calc(100% - 62px);
+ }
+
+ div.img {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ width: calc(100% - 8px);
+ height: calc(100% - 8px);
+ overflow: hidden;
+ }
+ }
+
+}
--
Gitblit v1.9.3