You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by sh...@apache.org on 2024/01/29 07:31:02 UTC
(incubator-answer) branch test updated: Feat/1.2.5/UI (#757)
This is an automated email from the ASF dual-hosted git repository.
shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
The following commit(s) were added to refs/heads/test by this push:
new 1ed4f626 Feat/1.2.5/UI (#757)
1ed4f626 is described below
commit 1ed4f626129ca136e51f53cad29df72a8c9cfdb5
Author: dashuai <li...@sifou.com>
AuthorDate: Mon Jan 29 15:30:54 2024 +0800
Feat/1.2.5/UI (#757)
---
ui/src/common/color.scss | 2 +-
ui/src/components/Comment/index.tsx | 2 --
ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ui/src/common/color.scss b/ui/src/common/color.scss
index 3d94899a..57353f1a 100644
--- a/ui/src/common/color.scss
+++ b/ui/src/common/color.scss
@@ -14,7 +14,7 @@
--an-f5: #f5f5f5;
--an-answer-item-border-top: rgba(0, 0, 0, .125);
--an-answer-inbox-nav-border-top: var(--bs-border-color);
- --an-comment-item-border-bottom: var(--bs-colors-gray-200);
+ --an-comment-item-border-bottom: var(--bs-colors-gray-200, #E9ECEF);
--an-editor-toolbar-hover: #f8f9fa;
--ans-editor-toolbar-focus: #dae0e5;
--an-editor-placeholder-color: #6c757d;
diff --git a/ui/src/components/Comment/index.tsx b/ui/src/components/Comment/index.tsx
index 7dad8e0f..be2d5553 100644
--- a/ui/src/components/Comment/index.tsx
+++ b/ui/src/components/Comment/index.tsx
@@ -420,12 +420,10 @@ const Comment = ({ objectId, mode, commentId }) => {
onClick={() => {
setPageIndex(pageIndex + 1);
}}>
- (
{t('show_more', {
count:
data.count - (pageIndex === 0 ? 3 : pageIndex * pageSize),
})}
- )
</Button>
)}
</div>
diff --git a/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx b/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx
index 12e186b3..353115f1 100644
--- a/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx
+++ b/ui/src/pages/Users/Settings/Account/components/MyLogins/index.tsx
@@ -79,7 +79,7 @@ const Index = () => {
onClick={(e) => deleteLogins(e, item)}>
<span
dangerouslySetInnerHTML={{
- __html: base64ToSvg(item.icon),
+ __html: base64ToSvg(item.icon, 'btnSvg me-2'),
}}
/>
<span>