From f001bfbd33dff2b400601e1daf8d4cad17d2eb4a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 08 Nov 2022 14:26:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/styles/base/index.scss | 222 ++++++++++++++++---------------------------------------
1 files changed, 66 insertions(+), 156 deletions(-)
diff --git a/src/styles/base/index.scss b/src/styles/base/index.scss
index 1c1959c..a77ef9e 100644
--- a/src/styles/base/index.scss
+++ b/src/styles/base/index.scss
@@ -139,21 +139,18 @@
.el-dialog__body {
flex: 1;
display: flex;
- flex-direction: column;
- }
-
- .dialog-side {
- display: flex;
- height: 36px;
- line-height: 36px;
-
- &>div:nth-of-type(1) {
- flex: 1;
+ flex-direction: row;
+ flex-wrap:wrap;
+ justify-self: flex-start;
+ align-content: flex-start;
+ .item {
display: flex;
- justify-content: space-between;
- margin-right: 10px;
+ flex-direction:row;
+ width: calc(50% - 20px);
+ height: 36px;
+ line-height: 36px;
+ margin: 0 10px;
text-align: left;
-
&>div:first-child {
width: 100px;
text-align: justify;
@@ -161,34 +158,15 @@
text-align-last: justify;
margin-right: 20px;
}
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
-
- }
-
- &>div:nth-of-type(2) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
-
- }
-
+
&>div:nth-of-type(2) {
width: calc(100% - 120px);
}
}
}
- }
+ }
+
+
}
.area-details-box {
@@ -210,51 +188,29 @@
.el-dialog__body {
flex: 1;
display: flex;
- flex-direction: column;
+ flex-direction: row;
+ flex-wrap:wrap;
+ justify-self: flex-start;
+ align-content: flex-start;
- .dialog-side {
+ .item {
display: flex;
+ flex-direction:row;
+ width: calc(50% - 20px);
height: 36px;
line-height: 36px;
-
- &>div:nth-of-type(1) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- margin-right: 10px;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
-
+ margin: 0 10px;
+ text-align: left;
+ &>div:first-child {
+ width: 100px;
+ text-align: justify;
+ display: inline-block;
+ text-align-last: justify;
+ margin-right: 20px;
}
-
+
&>div:nth-of-type(2) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
+ width: calc(100% - 120px);
}
}
}
@@ -331,52 +287,29 @@
.el-dialog__body {
flex: 1;
display: flex;
- flex-direction: column;
+ flex-direction: row;
+ flex-wrap:wrap;
+ justify-self: flex-start;
+ align-content: flex-start;
- .dialog-side {
+ .item {
display: flex;
+ flex-direction:row;
+ width: calc(50% - 20px);
height: 36px;
line-height: 36px;
-
- &>div:nth-of-type(1) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- margin-right: 10px;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
-
+ margin: 0 10px;
+ text-align: left;
+ &>div:first-child {
+ width: 100px;
+ text-align: justify;
+ display: inline-block;
+ text-align-last: justify;
+ margin-right: 20px;
}
-
+
&>div:nth-of-type(2) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
-
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
+ width: calc(100% - 120px);
}
}
@@ -386,6 +319,7 @@
line-height: 36px;
flex-direction: row;
text-align: left;
+ margin-left: 10px;
&>div:first-child {
width: 100px;
@@ -409,7 +343,7 @@
margin: 0 !important;
display: flex;
flex-direction: column;
- width: 600px;
+ width: 640px;
height: 400px;
top: 50%;
left: 50% !important;
@@ -423,52 +357,28 @@
.el-dialog__body {
flex: 1;
display: flex;
- flex-direction: column;
-
- .dialog-side {
+ flex-direction: row;
+ flex-wrap:wrap;
+ justify-self: flex-start;
+ align-content: flex-start;
+ .item {
display: flex;
+ flex-direction:row;
+ width: calc(50% - 20px);
height: 36px;
line-height: 36px;
-
- &>div:nth-of-type(1) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- margin-right: 10px;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
-
+ margin: 0 10px;
+ text-align: left;
+ &>div:first-child {
+ width: 100px;
+ text-align: justify;
+ display: inline-block;
+ text-align-last: justify;
+ margin-right: 20px;
}
&>div:nth-of-type(2) {
- flex: 1;
- display: flex;
- justify-content: space-between;
- text-align: left;
-
- &>div:first-child {
- width: 100px;
- text-align: justify;
- display: inline-block;
- text-align-last: justify;
- margin-right: 20px;
-
- }
-
- &>div:nth-of-type(2) {
- width: calc(100% - 120px);
- }
+ width: calc(100% - 120px);
}
}
}
--
Gitblit v1.9.3