From 82ff331ef9fd19f533b77ff81861c0cf88d14fe5 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Fri, 09 Aug 2024 08:47:52 +0800
Subject: [PATCH] 修改
---
customerSystem/src/styles/public.less | 5 +++++
customerSystem/src/assets/font/DingTalk_JinBuTi_Regular.ttf | 0
customerSystem/src/styles/theme.less | 16 +++++++++-------
customerSystem/src/components/Layout/Header.jsx | 6 +++---
customerSystem/src/components/Layout/index.less | 2 +-
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/customerSystem/src/assets/font/DingTalk_JinBuTi_Regular.ttf b/customerSystem/src/assets/font/DingTalk_JinBuTi_Regular.ttf
new file mode 100644
index 0000000..c4efa55
--- /dev/null
+++ b/customerSystem/src/assets/font/DingTalk_JinBuTi_Regular.ttf
Binary files differ
diff --git a/customerSystem/src/components/Layout/Header.jsx b/customerSystem/src/components/Layout/Header.jsx
index c6f91d5..519422a 100644
--- a/customerSystem/src/components/Layout/Header.jsx
+++ b/customerSystem/src/components/Layout/Header.jsx
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-11 11:33:21
- * @LastEditTime: 2023-05-12 20:42:27
+ * @LastEditTime: 2024-08-08 20:18:53
* @LastEditors: lwh
* @Version: 1.0.0
* @Description: 头部组件
@@ -118,8 +118,8 @@
<div className="header-logo">
<img src={logo_white} alt="" />
<div className="header-logo-text" style={{ color: '#fff' }}>
- <div className="header-logo-title">广州市白云区矛盾纠纷多元化解平台</div>
- <div>Guangzhou Baiyun Diversified Dispute Resolution Platform</div>
+ <div className="header-logo-title">广州市社会治安综合治理应用平台（综治中心模块）</div>
+ {/* <div>Guangzhou Baiyun Diversified Dispute Resolution Platform</div> */}
</div>
</div>
<div className="header-menu">
diff --git a/customerSystem/src/components/Layout/index.less b/customerSystem/src/components/Layout/index.less
index f535c68..37cfdf8 100644
--- a/customerSystem/src/components/Layout/index.less
+++ b/customerSystem/src/components/Layout/index.less
@@ -49,7 +49,7 @@
&-title {
font-size: 16px;
- font-family: AlibabaPuHuiTi;
+ font-family: DingTalk;
}
}
diff --git a/customerSystem/src/styles/public.less b/customerSystem/src/styles/public.less
index 0cf604a..dd5b52c 100644
--- a/customerSystem/src/styles/public.less
+++ b/customerSystem/src/styles/public.less
@@ -8,6 +8,11 @@
src: url('../assets/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf');
}
+@font-face {
+ font-family: DingTalk;
+ src: url('../assets/font/DingTalk_JinBuTi_Regular.ttf');
+}
+
html,
body {
margin: 0;
diff --git a/customerSystem/src/styles/theme.less b/customerSystem/src/styles/theme.less
index 406c94b..366ff84 100644
--- a/customerSystem/src/styles/theme.less
+++ b/customerSystem/src/styles/theme.less
@@ -2,18 +2,20 @@
@main-color: #1A6FB8;
// 主色拓展
-@main-color-1: #ffe7e6;
-@main-color-2: #ffb2a6;
-@main-color-4: #eb584d;
+@main-color-1: #E8F8FF;
+@main-color-2: #B6DDF1;
+@main-color-3: #89C2E3;
+@main-color-4: #5FA6D4;
+@main-color-5: #3A8AC6;
@input-placeholder-color: rgba(0, 0, 0, 0.5); // Input
@divider-color: rgba(0, 0, 0, 10%); // Divider
@primary-color: @main-color; // 全局主色
@link-color: @main-color; // 链接色
-@success-color: #52c41a; // 成功色
-@warning-color: #faad14; // 警告色
+@success-color: #00B42A; // 成功色
+@warning-color: #FA8C16; // 警告色
@warning-bg-color: #141413; // 警告色背景
-@error-color: #f5222d; // 错误色
+@error-color: #F53F3F; // 错误色
@font-size-base: 14px; // 主字号
@line-height-base: 1.5715;
@heading-color: rgba(0, 0, 0, 0.85); // 标题色
@@ -36,7 +38,7 @@
@mediaConfirm: #05aeae; // 项目司法确认相关颜色
-@pageAboutMargin: 24px; // 页面基础边距
+@pageAboutMargin: 16px; // 页面基础边距
@pageUpDownMargin: 16px; // 页面上下边距
--
Gitblit v1.8.0