From fb6f9653160ceea412eaca81856f42aa78856bea Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Tue, 25 Jan 2022 12:36:02 +0800
Subject: [PATCH] Merge branch 'liumei_font'
---
layout/h5Page/cNavBar.scss | 7 +++----
forms/input/cInputPhoneCode.scss | 4 +++-
common/custom.scss | 25 +++++++++++++++++++++++++
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/common/custom.scss b/common/custom.scss
index 8b2e9eb..1b4cd10 100644
--- a/common/custom.scss
+++ b/common/custom.scss
@@ -95,6 +95,12 @@
}
.at-list {
position: unset;
+ .item-content__info-note {
+ font-size: 34px;
+ }
+ .item-extra__info {
+ font-size: 36px;
+ }
}
.at-tabs.at-tabs--horizontal {
height: 100%;
@@ -211,6 +217,25 @@
font-size: 36px;
}
}
+ .at-divider {
+ .at-divider__content {
+ font-size: 36px;
+ }
+ }
+ .at-card {
+ .at-card__header-title {
+ font-size: 36px;
+ }
+ .at-card__header-extra {
+ font-size: 36px;
+ }
+ .at-card__content-info {
+ font-size: 36px;
+ }
+ }
+ .at-tag {
+ font-size: 36px;
+ }
}
.taro__toast,
diff --git a/forms/input/cInputPhoneCode.scss b/forms/input/cInputPhoneCode.scss
index 33510de..f719998 100644
--- a/forms/input/cInputPhoneCode.scss
+++ b/forms/input/cInputPhoneCode.scss
@@ -6,8 +6,10 @@
@import "../../common/sassMixin";
.c-input-phone-code {
- .c-input-phone-btn {
+ .at-button.c-input-phone-btn {
+ padding: 0 12px;
margin-right: 20px;
+ line-height: 54px;
border: none;
background: #2093df;
.at-button__text {
diff --git a/layout/h5Page/cNavBar.scss b/layout/h5Page/cNavBar.scss
index c8b947c..e319673 100644
--- a/layout/h5Page/cNavBar.scss
+++ b/layout/h5Page/cNavBar.scss
@@ -88,16 +88,15 @@
.box {
position: relative;
z-index: 2;
- width: 187px;
+ width: 200px;
padding: 9px 0;
background-color: #f7f8fa;
border-radius: 5px;
box-shadow: rgba(#000, 0.1) 0 1PX 1PX 1PX;
.item {
- padding: 0 21px;
text-align: center;
- line-height: 75px;
- font-size: 30px;
+ line-height: 80px;
+ font-size: 36px;
@include ellipsis(100%);
box-sizing: border-box;
border-bottom: #edf0f8 1PX solid;
--
Gitblit v1.9.1