Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1432 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-12-24 19:49:21 +03:00 committed by GitHub
parent a170b138cb d47fb111df
commit bdd8958932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/mobile/resources/less/about.less
View file

@ -13,10 +13,10 @@
.content-block { .content-block {
margin: 0 auto 15px; margin: 0 auto 15px;
// a { a {
// color: @text-normal; color: @text-normal;
// } }
} }
.settings-about-logo { .settings-about-logo {
display: flex; display: flex;

6
apps/common/mobile/resources/less/common.less
View file

@ -154,10 +154,12 @@
.about { .about {
.content-block { .content-block {
margin: 0 auto 15px; margin: 0 auto 15px;
p:last-child {
p:last-child a{
color: var(--brand-word);
text-decoration: underline; text-decoration: underline;
} }
} }
} }
.content-block { .content-block {

27
apps/documenteditor/mobile/src/view/edit/EditText.jsx
View file

@ -189,7 +189,7 @@ const PageAdditionalFormatting = props => {
) )
}; };
const PageBullets = props => { const PageBullets = observer( props => {
const { t } = useTranslation(); const { t } = useTranslation();
const bulletArrays = [ const bulletArrays = [
[ [
@ -219,8 +219,7 @@ const PageBullets = props => {
if (bullet.type === -1) { if (bullet.type === -1) {
storeTextSettings.resetBullets(-1); storeTextSettings.resetBullets(-1);
} }
props.onBullet(bullet.type) props.onBullet(bullet.type);
props.f7router.back();
}}> }}>
{bullet.thumb.length < 1 ? {bullet.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}> <Icon className="thumb" style={{position: 'relative'}}>
@ -234,9 +233,9 @@ const PageBullets = props => {
))} ))}
</View> </View>
) )
}; });
const PageNumbers = props => { const PageNumbers = observer( props => {
const { t } = useTranslation(); const { t } = useTranslation();
const numberArrays = [ const numberArrays = [
[ [
@ -267,8 +266,7 @@ const PageNumbers = props => {
if (number.type === -1) { if (number.type === -1) {
storeTextSettings.resetNumbers(-1); storeTextSettings.resetNumbers(-1);
} }
props.onNumber(number.type) props.onNumber(number.type);
props.f7router.back();
}}> }}>
{number.thumb.length < 1 ? {number.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}> <Icon className="thumb" style={{position: 'relative'}}>
@ -282,9 +280,9 @@ const PageNumbers = props => {
))} ))}
</View> </View>
) )
}; });
const PageMultiLevel = props => { const PageMultiLevel = observer( props => {
const { t } = useTranslation(); const { t } = useTranslation();
const arrayMultiLevel = [ const arrayMultiLevel = [
@ -305,7 +303,6 @@ const PageMultiLevel = props => {
onClick={(e) => { onClick={(e) => {
item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null); item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null);
props.onMultiLevelList(item.type); props.onMultiLevelList(item.type);
props.f7router.back();
}}> }}>
{item.thumb.length < 1 ? {item.thumb.length < 1 ?
<Icon className="thumb" style={{position: 'relative'}}> <Icon className="thumb" style={{position: 'relative'}}>
@ -319,7 +316,7 @@ const PageMultiLevel = props => {
</View> </View>
) )
} });
const PageBulletsAndNumbers = props => { const PageBulletsAndNumbers = props => {
const { t } = useTranslation(); const { t } = useTranslation();
@ -337,13 +334,13 @@ const PageBulletsAndNumbers = props => {
} }
</Navbar> </Navbar>
<Swiper pagination> <Swiper pagination>
<SwiperSlide> <PageNumbers f7router={props.f7router} storeTextSettings={storeTextSettings} onNumber={props.onNumber}/></SwiperSlide> <SwiperSlide> <PageNumbers storeTextSettings={storeTextSettings} onNumber={props.onNumber}/></SwiperSlide>
<SwiperSlide> <PageBullets f7router={props.f7router} storeTextSettings={storeTextSettings} onBullet={props.onBullet}/></SwiperSlide> <SwiperSlide> <PageBullets storeTextSettings={storeTextSettings} onBullet={props.onBullet}/></SwiperSlide>
<SwiperSlide> <PageMultiLevel f7router={props.f7router} storeTextSettings={storeTextSettings} onMultiLevelList={props.onMultiLevelList}/> </SwiperSlide> <SwiperSlide> <PageMultiLevel storeTextSettings={storeTextSettings} onMultiLevelList={props.onMultiLevelList}/> </SwiperSlide>
</Swiper> </Swiper>
</Page> </Page>
) )
} };
const PageLineSpacing = props => { const PageLineSpacing = props => {
const { t } = useTranslation(); const { t } = useTranslation();