From 4300b5c714bb7e09f53f7d722c953dec9c809d8e Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 04 Jan 2021 17:08:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/common/styles/index.css | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index ce7f84b..033ad97 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{
@@ -104,7 +112,7 @@
color: #a5abaf;
}
.light-gray{
- color: #a7a7a7;
+ color: #d8d6d6;
}
.dark-gray{
color: #3a3f3f;
@@ -209,20 +217,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%;
@@ -236,11 +247,15 @@
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;
}
@@ -256,6 +271,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;
@@ -286,4 +305,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