From e741b70fc22dc65e4a40595c50bb9057bed15667 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期二, 18 三月 2025 11:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/modelLibrary
---
src/styles/global.less | 139 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 119 insertions(+), 20 deletions(-)
diff --git a/src/styles/global.less b/src/styles/global.less
index 936bdb4..d798770 100644
--- a/src/styles/global.less
+++ b/src/styles/global.less
@@ -11,6 +11,44 @@
margin: 0;
padding: 0;
height: 100%;
+ width: 100%;
+}
+div,
+span,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+a,
+img,
+strong,
+sub,
+sup,
+ol,
+ul,
+li,
+form,
+label,
+table,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+canvas,
+audio,
+video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ /* vertical-align: baseline; */
}
// 娣峰叆
@@ -48,18 +86,10 @@
color: #535bf2;
}
-html,
-body {
- margin: 0;
- display: flex;
- place-items: center;
- width: 100%;
- height: 100%;
-}
-
h1 {
font-size: 3.2em;
line-height: 1.1;
+ margin:0;
}
button {
@@ -91,7 +121,7 @@
width: 100%;
height: 100%;
margin: 0 auto;
- text-align: center;
+ // text-align: center;
}
@@ -99,11 +129,10 @@
.common-layout {
width: 100%;
- height: 100%;
+ height: 100%
}
-.el-container {
- width: 100%;
+.common-layout .el-container {
height: 100%;
}
@@ -111,19 +140,43 @@
background-color: #fff;
color: #333;
line-height: 60px;
-}
-
-.el-aside {
- background-color: #D3DCE6;
- color: #333;
+ border-bottom: 1px solid #ebeef5;
}
.el-main {
background-color: #E9EEF3;
color: #333;
- padding: 10px !important;
+ padding: 0 !important;
+ box-sizing: border-box;
+ flex: auto;
+
+}
+.pageContainer{
+ display: flex;
+ width: 100%;
+ height: 100%;
+ // background-color: #fff;
+ padding-top: 10px;
box-sizing: border-box;
}
+.menuBox{
+ box-sizing: border-box;
+
+}
+.contentBox{
+ flex:1 1;
+ box-sizing: border-box;
+ overflow: hidden;
+ padding:10px;
+ background-color: #fff;
+}
+
+.el-table__header{
+ thead .el-table__cell{
+ background:#f1f1f1;
+ }
+}
+
.mb-4 {
margin-bottom: 16px;
@@ -147,4 +200,50 @@
button {
background-color: #f9f9f9;
}
-}
\ No newline at end of file
+}
+
+//鑷畾涔�
+ul {
+ list-style: none;
+ margin:0
+}
+
+.flex{
+ display: flex;
+}
+/* 鍨傜洿灞呬腑 */
+.ai-c {
+ align-items: center;
+}
+
+/* 涓よ竟瀵归綈 */
+.jc-sb {
+ justify-content: space-between;
+}
+.hover{
+ cursor: pointer;
+
+}
+
+::-webkit-scrollbar {
+ width: 10px;
+ height: 10px;
+}
+
+::-webkit-scrollbar-track-piece {
+ background-color: rgba(0, 0, 0, 0.2);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:vertical {
+ height: 5px;
+ background-color: rgba(125, 125, 125, 0.7);
+ -webkit-border-radius: 6px;
+}
+
+::-webkit-scrollbar-thumb:horizontal {
+ width: 5px;
+ background-color: rgba(125, 125, 125, 0.7);
+ -webkit-border-radius: 6px;
+}
+
--
Gitblit v1.9.1