From 82c48f3b548145d0cb3c652c47ed4def1e3e4c77 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Fri, 18 Dec 2020 15:48:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/common/styles/index.css | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/hive-app/common/styles/index.css b/hive-app/common/styles/index.css
index 8beb434..b98e911 100644
--- a/hive-app/common/styles/index.css
+++ b/hive-app/common/styles/index.css
@@ -29,6 +29,9 @@
margin-left: 20px;
}
+.mr-0{
+ margin-right: 0;
+}
.mr-5{
margin-right: 5px;
}
@@ -42,6 +45,9 @@
margin-right: 20px;
}
+.mb-0{
+ margin-bottom: 0!important;
+}
.mb-5{
margin-bottom: 5px;
}
@@ -56,6 +62,9 @@
}
/* 字体 */
+.font-10{
+ font-size: 10px;
+}
.font-12{
font-size: 12px;
}
@@ -86,7 +95,7 @@
color: #FFFFFF;
}
.gray{
- color: #8c9fad;
+ color: #a5abaf;
}
.light-gray{
color: #a7a7a7;
@@ -132,6 +141,9 @@
.flex-wrap{
flex-wrap: wrap;
}
+.align-left{
+ align-items: flex-start;
+}
.align-center{
align-items: center;
}
@@ -156,11 +168,14 @@
.placeholder{
color: #999999;
}
+.left{
+ text-align: left;
+}
.center{
text-align: center;
}
.right{
- text-align: end;
+ text-align: right;
}
/* 默认蓝色按钮 */
@@ -171,7 +186,6 @@
font-size: 16px;
line-height: 42px;
}
-
/* 蓝色边框白底按钮 */
.white-btn{
background: #FFFFFF;
@@ -179,6 +193,35 @@
color: #518EFF;
font-size: 16px;
line-height: 42px;
+}
+/* 蓝色圆形加减按钮 */
+.blue-btn-circle{
+ height: 24px;
+ width: 24px;
+ line-height: 24px;
+ box-sizing: border-box;
+ font-size: 14px!important;
+ border-radius: 50%!important;
+ background: #518EFF;
+ border-radius: 4px;
+ color: #FFFFFF;
+}
+.blue-outline-btn-circle{
+ height: 24px;
+ width: 24px;
+ line-height: 22px;
+ box-sizing: border-box;
+ font-size: 12px!important;
+ border-radius: 50%;
+ border: 2px solid #518EFF;
+ color: #518EFF;
+}
+.small-btn{
+ width: 100px;
+ line-height: 32px;
+ font-size: 14px;
+ border-radius: 20px;
+ text-align: center;
}
/* 固定底部 */
@@ -228,4 +271,6 @@
padding: 4px 8px;
margin-left: 8px;
border-radius: 2px;
+ font-size: 14px;
}
+
--
Gitblit v1.9.1