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

Merge pull request #1595 from ONLYOFFICE/feature/fix-bug-react

Browse source 
Feature/fix bug react
This commit is contained in:
maxkadushkin 2022-02-25 10:05:10 +03:00 committed by GitHub
parent 4ba266c6c7 e3459aa8f0
commit 3245a11beb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/mobile/resources/less/comments.less
View file

@ -242,6 +242,9 @@
.actions-modal.modal-in { .actions-modal.modal-in {
z-index: 13700; z-index: 13700;
.actions-group::after {
background-color: @background-menu-divider;
}
} }
.actions-backdrop.backdrop-in { .actions-backdrop.backdrop-in {

2
apps/documenteditor/mobile/src/less/app-ios.less
View file

@ -32,7 +32,7 @@
border-top: 1px solid #446995; border-top: 1px solid #446995;
border-bottom: 1px solid #446995; border-bottom: 1px solid #446995;
input { input {
color: #000; color: @text-normal;
font-size: 17px; font-size: 17px;
font-weight: var(--f7-list-item-after-line-height); font-weight: var(--f7-list-item-after-line-height);
} }

2
apps/documenteditor/mobile/src/less/app-material.less
View file

@ -79,7 +79,7 @@
border:none; border:none;
input { input {
color: #000; color: @text-normal;
font-size: 16px; font-size: 16px;
width: 40px; width: 40px;
font-weight: var(--f7-list-item-after-line-height); font-weight: var(--f7-list-item-after-line-height);

2
apps/documenteditor/mobile/src/less/icons-material.less
View file

@ -78,7 +78,7 @@
&.icon-expand-down { &.icon-expand-down {
width: 17px; width: 17px;
height: 17px; height: 17px;
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{fill-white}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>', @fill-white); .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{brand-word}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>');
} }
&.icon-expand-up { &.icon-expand-up {
width: 17px; width: 17px;

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

@ -14,23 +14,25 @@ const PageListMove = props => {
const allSheets = sheets.sheets; const allSheets = sheets.sheets;
return ( return (
<Page> <View style={!Device.phone ? {height: '420px'} : null}>
<Navbar title={t('Statusbar.textMoveBefore')}/> <Page>
<List> <Navbar title={t('Statusbar.textMoveBefore')}/>
<ListGroup> <List>
{ allSheets.map((model, index) => <ListGroup>
model.hidden ? null : { allSheets.map((model, index) =>
model.hidden ? null :
<ListItem
key={model.name}
title={model.name}
onClick={() => onMenuMoveClick(index)} />)
}
<ListItem <ListItem
key={model.name} title={t('Statusbar.textMoveToEnd')}
title={model.name} onClick={() => onMenuMoveClick(-255)}/>
onClick={() => onMenuMoveClick(index)} />) </ListGroup>
} </List>
<ListItem </Page>
title={t('Statusbar.textMoveToEnd')} </View>
onClick={() => onMenuMoveClick(-255)}/>
</ListGroup>
</List>
</Page>
) )
}; };
@ -40,19 +42,21 @@ const PageAllList = (props) => {
const allSheets = sheets.sheets; const allSheets = sheets.sheets;
return ( return (
<Page> <View style={{height: '240px'}}>
<List> <Page>
{ allSheets.map( (model,sheetIndex) => <List>
<ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}> { allSheets.map( (model,sheetIndex) =>
{model.hidden ? <ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}>
<div slot='after'> {model.hidden ?
{t('Statusbar.textHidden')} <div slot='after'>
</div> {t('Statusbar.textHidden')}
: null} </div>
</ListItem>) : null}
} </ListItem>)
</List> }
</Page> </List>
</Page>
</View>
) )
}; };
@ -138,7 +142,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
</Actions> </Actions>
) : null} ) : null}
{ {
<Popover style={{height: '240px'}} id="idx-all-list" className="all-list"> <Popover id="idx-all-list" className="all-list">
<PageAllList sheets={sheets} onTabListClick={props.onTabListClick}/> <PageAllList sheets={sheets} onTabListClick={props.onTabListClick}/>
</Popover> </Popover>
} }
@ -150,7 +154,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
<PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/> <PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/>
</Sheet> </Sheet>
: :
<Popover style={{height: '420px'}} id="idx-move-sheet-popover" closeByOutsideClick={false}> <Popover id="idx-move-sheet-popover" closeByOutsideClick={false}>
<PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/> <PageListMove sheets={sheets} onMenuMoveClick={props.onMenuMoveClick}/>
</Popover> </Popover>
} }