From 01b55d7e82c3b13554a412e9c5be0fc96a4906a3 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Tue, 05 Jan 2021 18:22:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/common/styles/index.css | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index c5c2597..81d42d8 100644
--- a/hive-app/common/styles/index.css
+++ b/hive-app/common/styles/index.css
@@ -1,4 +1,9 @@
-
+/* 状态栏 */
+.status_bar {
+ height: var(--status-bar-height);
+ width: 100%;
+ color: #0000FF;
+}
/* 间距 */
.mt-5{
margin-top: 5px;
@@ -27,6 +32,9 @@
}
.ml-20{
margin-left: 20px;
+}
+.ml-30{
+ margin-left: 30px;
}
.mr-0{
@@ -68,6 +76,9 @@
.font-12{
font-size: 12px;
}
+.font-13{
+ font-size: 13px;
+}
.font-14{
font-size: 14px;
}
@@ -86,6 +97,9 @@
.font-20{
font-size: 20px;
}
+.font-24{
+ font-size: 24px;
+}
/* 颜色 */
.blue{
@@ -98,7 +112,7 @@
color: #a5abaf;
}
.light-gray{
- color: #a7a7a7;
+ color: #d8d6d6;
}
.dark-gray{
color: #3a3f3f;
@@ -124,6 +138,9 @@
.font-dark{
color: #111111;
}
+.font-darkGray{
+ color: #666666;
+}
.font-bold{
font-weight: 700;
}
@@ -142,7 +159,7 @@
flex-wrap: wrap;
}
.align-left{
- align-items: flex-start;
+ align-items: baseline;
}
.align-center{
align-items: center;
@@ -168,6 +185,9 @@
.placeholder{
color: #999999;
}
+.left{
+ text-align: left;
+}
.center{
text-align: center;
}
@@ -183,6 +203,13 @@
font-size: 16px;
line-height: 42px;
}
+.red-btn{
+ background: #DE5A5A;
+ border: 0;
+ color: #FFFFFF;
+ font-size: 16px;
+ line-height: 42px;
+}
/* 蓝色边框白底按钮 */
.white-btn{
background: #FFFFFF;
@@ -193,20 +220,23 @@
}
/* 蓝色圆形加减按钮 */
.blue-btn-circle{
+ display: inline-block;
height: 24px;
width: 24px;
line-height: 24px;
+ text-align: center;
box-sizing: border-box;
font-size: 14px!important;
border-radius: 50%!important;
background: #518EFF;
- border-radius: 4px;
color: #FFFFFF;
}
.blue-outline-btn-circle{
+ display: inline-block;
height: 24px;
width: 24px;
line-height: 22px;
+ text-align: center;
box-sizing: border-box;
font-size: 12px!important;
border-radius: 50%;
@@ -214,17 +244,21 @@
color: #518EFF;
}
.small-btn{
- width: 100px;
- line-height: 32px;
+ width: 90px;
+ line-height: 30px;
font-size: 14px;
border-radius: 20px;
text-align: center;
+}
+uni-button[disabled]:not([type]), uni-button[disabled][type=default]{
+ color: #FFFFFF;
+ background-color: rgba(36, 131, 255, 0.4);
}
/* 固定底部 */
.sticky-footer{
position: fixed;
- bottom: 15px;
+ bottom: 20px;
left: 10px;
right: 10px;
}
@@ -240,6 +274,10 @@
}
.input-group-row .label{
padding-right: 10px;
+ max-width: 220px;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
}
.input-group-row .label .require{
color: #d20808;
@@ -270,4 +308,20 @@
border-radius: 2px;
font-size: 14px;
}
-
+.input-group-cloume{
+ font-size: 14px;
+}
+.input-group-cloume .label{
+ display: block;
+ margin: 12px 0 10px;
+}
+.input-group-cloume textarea{
+ display: block;
+ width: 100%;
+ height: 50px;
+ padding: 5px;
+ border: 1px solid #EDEAF4;
+ box-sizing: border-box;
+ border-radius: 2px;
+ font-size: 14px;
+}
--
Gitblit v1.9.1