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 |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index 4a2e383..81d42d8 100644
--- a/hive-app/common/styles/index.css
+++ b/hive-app/common/styles/index.css
@@ -33,6 +33,9 @@
 .ml-20{
 	margin-left: 20px;
 }
+.ml-30{
+	margin-left: 30px;
+}
 
 .mr-0{
 	margin-right: 0;
@@ -134,6 +137,9 @@
 }
 .font-dark{
 	color: #111111;
+}
+.font-darkGray{
+	color: #666666;
 }
 .font-bold{
 	font-weight: 700;
@@ -244,6 +250,10 @@
 	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{
@@ -264,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;
@@ -294,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