A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix(ui): resolve conflict
shuaib35d2564b5ea
diff --cc ui/src/index.scssindex 9c34473b,1344917e..549ffe78--- a/ui/src/index.scss+++ b/ui/src/index.scss@@@ -300,11 -296,5 +296,11 @@@ a}}.bg-fade-out {- animation: 2s ease 1s bg-fade-out;+ animation: bg-fade-out 2s ease 0.3s;}+++.btnSvg, .btnSvg:hover {+ fill: currentColor;+ vertical-align: -0.125em;+}diff --cc ui/src/pages/Users/Login/index.tsxindex c046bc5a,2172b75b..0b510a3e--- a/ui/src/pages/Users/Login/index.tsx+++ b/ui/src/pages/Users/Login/index.tsx@@@ -12,8 -12,11 +12,12 @@@ import typeFormDataType,} from '@/common/interface';import { Unactivate } from '@/components';+import { PluginOauth } from '@/plugins';- import { loggedUserInfoStore, loginSettingStore } from '@/stores';+ import {+ loggedUserInfoStore,+ loginSettingStore,+ siteInfoStore,+ } from '@/stores';import { guard, floppyNavigation, handleFormError } from '@/utils';import { login, checkImgCode } from '@/services';import { PicAuthCodeModal } from '@/components/Modal';@@@ -171,10 -174,11 +175,12 @@@ const Index: React.FC = () =>});return (<Container style={{ paddingTop: '4rem', paddingBottom: '5rem' }}>- <h3 className="text-center mb-5">{t('page_title')}</h3>+ <h3 className="text-center mb-5">+ {t('page_title', { site_name: siteName })}+ </h3>{step === 1 && (<Col className="mx-auto" md={3}>+ <PluginOauth className="mb-5" /><Form noValidate onSubmit={handleSubmit}><Form.Group controlId="email" className="mb-3"><Form.Label>{t('email.label')}</Form.Label>