From 6c270e79bd140413663fb0a37b1b0ff41b868956 Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Tue, 21 Sep 2021 00:54:18 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E5=9F=BA=E7=A1=80=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=8E=E9=83=A8=E5=88=86=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/i18n/langs/en-US/translation.json | 4 ++++
 shared/i18n/langs/zh-CN/translation.json | 4 ++++
 web/src/components/FriendPicker.tsx      | 8 ++++++--
 web/src/styles/global.less               | 4 ++--
 web/tailwind.config.js                   | 4 ++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/shared/i18n/langs/en-US/translation.json b/shared/i18n/langs/en-US/translation.json
index 3417adc8..bf215ac7 100644
--- a/shared/i18n/langs/en-US/translation.json
+++ b/shared/i18n/langs/en-US/translation.json
@@ -15,6 +15,7 @@
   "k24ccd723": "Refresh now",
   "k267cc491": "Me",
   "k2d6cfb27": "Chat Channel",
+  "k2ec4966c": "Selected {{num}} items",
   "k3172297b": "This feature is not yet open",
   "k31a9d6a3": "The connect to the server is broken",
   "k34b5e3ab": "Send Message",
@@ -61,6 +62,7 @@
   "k744ee9a": "Create Group",
   "k74aef1ad": "Members",
   "k78e52ed0": "Accept",
+  "k7a2ccf9b": "Search Friends",
   "k7c232f9e": "Panel",
   "k7daefc98": "Invite you to join the group",
   "k7ec9199a": "Friend request waiting for process",
@@ -77,6 +79,7 @@
   "k979fc780": "Unable to join the room, you will not be able to get the latest information, please refresh the page and try again",
   "k9bb01902": "Show Detail",
   "k9d901c20": "Meeting room",
+  "k9f3089ce": "Create",
   "k9fa72780": "Conversation with {{name}}",
   "ka01a00eb": "System language",
   "ka0451c97": "Cancel",
@@ -115,6 +118,7 @@
   "kd417f93a": "Do you want to delete the other party from your friend list? Note: You will not disappear from the other party's friend list",
   "kd4ff36fa": "Search Friends",
   "kd637a30": "Group Invite Service",
+  "kda0e155e": "Create multiplayer converse",
   "kda67b115": "Unknown panel type",
   "kdb57357d": "Connection failed",
   "kdc18deca": "Invite users",
diff --git a/shared/i18n/langs/zh-CN/translation.json b/shared/i18n/langs/zh-CN/translation.json
index e19c6b13..19675146 100644
--- a/shared/i18n/langs/zh-CN/translation.json
+++ b/shared/i18n/langs/zh-CN/translation.json
@@ -15,6 +15,7 @@
   "k24ccd723": "立即刷新",
   "k267cc491": "我",
   "k2d6cfb27": "聊天频道",
+  "k2ec4966c": "已选择 {{num}} 项",
   "k3172297b": "该功能暂未开放",
   "k31a9d6a3": "与服务器的链接已断开",
   "k34b5e3ab": "发送消息",
@@ -61,6 +62,7 @@
   "k744ee9a": "创建群组",
   "k74aef1ad": "成员",
   "k78e52ed0": "接受",
+  "k7a2ccf9b": "搜索好友",
   "k7c232f9e": "面板",
   "k7daefc98": "邀请您加入群组",
   "k7ec9199a": "等待对方处理的好友请求",
@@ -77,6 +79,7 @@
   "k979fc780": "无法加入房间, 您将无法获取到最新的信息, 请刷新页面后重试",
   "k9bb01902": "显示详情",
   "k9d901c20": "会议室",
+  "k9f3089ce": "创建",
   "k9fa72780": "与 {{name}} 的会话",
   "ka01a00eb": "系统语言",
   "ka0451c97": "取消",
@@ -115,6 +118,7 @@
   "kd417f93a": "是否要从自己的好友列表中删除对方? 注意:你不会从对方的好友列表消失",
   "kd4ff36fa": "查找好友",
   "kd637a30": "群组邀请服务",
+  "kda0e155e": "创建多人会话",
   "kda67b115": "未知的面板类型",
   "kdb57357d": "连接失败",
   "kdc18deca": "邀请用户",
diff --git a/web/src/components/FriendPicker.tsx b/web/src/components/FriendPicker.tsx
index 74449aa8..a8b989e5 100644
--- a/web/src/components/FriendPicker.tsx
+++ b/web/src/components/FriendPicker.tsx
@@ -71,7 +71,9 @@ export const FriendPicker: React.FC<FriendPickerProps> = React.memo((props) => {
       )}
 
       <div>
-        {t('已选择')}: {selectedIds.length}
+        {t('已选择 {{num}} 项', {
+          num: selectedIds.length,
+        })}
       </div>
 
       {_take(
@@ -88,7 +90,9 @@ export const FriendPicker: React.FC<FriendPickerProps> = React.memo((props) => {
               <div className="flex items-center">
                 <Avatar size="small" name={info.nickname} src={info.avatar} />
 
-                <div className="ml-1 text-white">{info.nickname}</div>
+                <div className="ml-1 text-typography-light dark:text-typography-dark">
+                  {info.nickname}
+                </div>
               </div>
             </Checkbox>
           </div>
diff --git a/web/src/styles/global.less b/web/src/styles/global.less
index 0d491471..89a49c6e 100644
--- a/web/src/styles/global.less
+++ b/web/src/styles/global.less
@@ -1,5 +1,5 @@
 #tailchat-app {
-  @apply text-gray-700;
+  @apply text-typography-light;
 
   /* 滚动条 */
   ::-webkit-scrollbar {
@@ -35,7 +35,7 @@
 
   // 深色模式覆盖
   &.dark {
-    color: rgba(255, 255, 255, 0.85);
+    @apply text-typography-dark;
 
     ::-webkit-scrollbar-corner {
       background-color: transparent;
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 98ab1e8f..fc3fcdb7 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -67,6 +67,10 @@ module.exports = {
           light: colors.coolGray[100],
           dark: colors.coolGray[700],
         },
+        typography: {
+          light: colors.coolGray[700],
+          dark: 'rgba(255, 255, 255, 0.85)',
+        },
       },
       borderRadius: {
         '1/2': '50%',