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

Merge pull request #1901 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-08-18 16:28:38 +03:00 committed by GitHub
parent 68249ee817 21be71a26d
commit f3c7f5cfc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,9 +69,9 @@
.title {
font-weight: 600;
color: @text-normal;
line-height: 17px;
//line-height: 17px;
max-height: 34px;
overflow: hidden;
//overflow: hidden;
}
.navbar-inner, .subnavbar-inner {
z-index: auto;
@ -169,7 +169,7 @@
.page-content {
> .list {
&:last-child {
margin-bottom: 30px;
// margin-bottom: 30px;
}
}
}

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

@ -147,6 +147,7 @@
.bullets,
.numbers,
.multilevels {
min-height: 160px;
.row.list {
margin: 0;
ul {

9
apps/documenteditor/mobile/src/less/app.less
View file

@ -132,6 +132,7 @@
}
}
// Swiper
.swiper-container {
height: 100%;
.swiper-pagination-bullet-active{
@ -147,6 +148,14 @@
// }
}
.swiper-pagination-bullets {
position: relative;
margin-top: 10px;
.swiper-pagination-bullet {
margin: 0 8px;
}
}
// Skeleton table
.table-styles .row div:not(:first-child) {

6
apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
View file

@ -207,7 +207,7 @@ const EditParagraph = props => {
onStyleMenuDelete: props.onStyleMenuDelete
}}>
{curStyle &&
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}></div>
<div slot="inner" style={{backgroundImage: 'url(' + curStyle.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}></div>
}
</ListItem>
</List>
@ -278,7 +278,7 @@ const EditParagraphStyle = props => {
}}
>
<div slot="inner"
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
></div>
{!api.asc_IsStyleDefault(style.name) && (
<div slot="inner-end">
@ -369,7 +369,7 @@ const ChangeNextParagraphStyle = props => {
}}
>
<div slot="inner"
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: '100% ' + thumbSize.height + 'px', backgroundRepeat: 'no-repeat'}}
style={{backgroundImage: 'url(' + style.image + ')', width: '100%', height: thumbSize.height + 'px', backgroundSize: 'contain', backgroundRepeat: 'no-repeat'}}
></div>
</ListItem>
))}

2
apps/documenteditor/mobile/src/view/edit/EditTableContents.jsx
View file

@ -273,7 +273,7 @@ const PageEditStructureTableContents = props => {
}}>
{isAndroid ? <Icon icon="icon-expand-down"></Icon> : ' - '}
</Button>
{isAndroid && <label>{style.value}</label>}
{isAndroid && <label>{style.value === 0 ? '' : style.value}</label>}
<Button outline className='increment item-link' onClick={() => {
if(style.value < 9) {
setAmountLevels(-1);

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

@ -213,9 +213,7 @@ const PageBullets = observer( props => {
storeTextSettings.resetBullets(bullet.subtype);
props.onBullet(bullet.subtype);
}}>
<div id={`id-markers-${bullet.subtype}`} className='item-marker'>
</div>
<div id={`id-markers-${bullet.subtype}`} className='item-marker'></div>
</ListItem>
))}
</List>

5
apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
View file

@ -41,6 +41,7 @@ const PageAllList = (props) => {
const { t } = useTranslation();
const { sheets, onTabListClick } = props;
const allSheets = sheets.sheets;
const heightView = Device.android ? allSheets.length * 48 : allSheets.length * 44;
useEffect(() => {
const tabs = $$('.sheet-tabs .tab');
@ -59,10 +60,10 @@ const PageAllList = (props) => {
}, [sheets.activeWorksheet]);
return (
<View style={{height: '240px'}}>
<View style={{maxHeight: '240px', height: heightView > 240 ? '240px' : `${heightView}px`}}>
<Page>
<List>
{ allSheets.map( (model,sheetIndex) =>
{allSheets.map((model, sheetIndex) =>
<ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}>
{model.hidden ?
<div slot='after'>