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

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

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-07-11 11:10:15 +03:00 committed by GitHub
parent e045c0f41c d1ca05f2e4
commit a5917e5a36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,9 @@
.item-link .item-inner { .item-link .item-inner {
width: 100%; width: 100%;
} }
.item-inner {
color: @text-normal;
}
} }
// Bullets, numbers and multilevels // Bullets, numbers and multilevels
@ -1132,6 +1135,15 @@ input[type="number"]::-webkit-inner-spin-button {
border: 0.5px solid @background-menu-divider; border: 0.5px solid @background-menu-divider;
} }
// Navigation list
.list.navigation-list {
.item-title {
color: @text-normal;
}
}

11
apps/documenteditor/mobile/src/view/add/AddOther.jsx
View file

@ -159,7 +159,8 @@ const AddOther = props => {
let isShape = storeFocusObjects.settings.indexOf('shape') > -1, let isShape = storeFocusObjects.settings.indexOf('shape') > -1,
isText = storeFocusObjects.settings.indexOf('text') > -1, isText = storeFocusObjects.settings.indexOf('text') > -1,
isChart = storeFocusObjects.settings.indexOf('chart') > -1; isChart = storeFocusObjects.settings.indexOf('chart') > -1,
isHeader = storeFocusObjects.settings.indexOf('header') > -1;
let disabledAddLink = false, let disabledAddLink = false,
disabledAddBreak = false, disabledAddBreak = false,
@ -209,9 +210,11 @@ const AddOther = props => {
<Icon slot="media" icon="icon-sectionbreak"></Icon> <Icon slot="media" icon="icon-sectionbreak"></Icon>
</ListItem> </ListItem>
} }
<ListItem title={_t.textTableContents} link="/add-table-contents/"> {!isHeader &&
<Icon slot="media" icon="icon-table-contents"></Icon> <ListItem title={_t.textTableContents} link="/add-table-contents/">
</ListItem> <Icon slot="media" icon="icon-table-contents"></Icon>
</ListItem>
}
{(isShape || isChart) || (isText && disabledAddFootnote) ? null : {(isShape || isChart) || (isText && disabledAddFootnote) ? null :
<ListItem key='footnote' title={_t.textFootnote} link={'/add-footnote/'} routeProps={{ <ListItem key='footnote' title={_t.textFootnote} link={'/add-footnote/'} routeProps={{
getFootnoteProps: props.getFootnoteProps, getFootnoteProps: props.getFootnoteProps,

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

@ -196,12 +196,11 @@ const EditParagraph = props => {
const paragraph = props.storeFocusObjects.paragraphObject; const paragraph = props.storeFocusObjects.paragraphObject;
const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph); const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph);
const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : ''; const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : '';
const activeStyle = Device.android ? 'link no-active-state' : 'no-active-state';
return ( return (
<Fragment> <Fragment>
<BlockTitle>{t('Edit.textParagraphStyle')}</BlockTitle> <BlockTitle>{t('Edit.textParagraphStyle')}</BlockTitle>
<List className={activeStyle} style={{marginBottom: 0}}> <List style={{marginBottom: 0}}>
<ListItem link="/edit-paragraph-style/" title={!curStyle && curStyleName} routeProps={{ <ListItem link="/edit-paragraph-style/" title={!curStyle && curStyleName} routeProps={{
onStyleClick: props.onStyleClick, onStyleClick: props.onStyleClick,
onSaveStyle: props.onSaveStyle, onSaveStyle: props.onSaveStyle,
@ -246,7 +245,6 @@ const EditParagraphStyle = props => {
const paragraphStyles = storeParagraphSettings.paragraphStyles; const paragraphStyles = storeParagraphSettings.paragraphStyles;
const curStyleName = storeParagraphSettings.styleName; const curStyleName = storeParagraphSettings.styleName;
const thumbSize = storeParagraphSettings.styleThumbSize; const thumbSize = storeParagraphSettings.styleThumbSize;
const activeStyle = Device.android ? 'link no-active-state' : 'no-active-state';
return ( return (
<Page> <Page>
@ -266,7 +264,7 @@ const EditParagraphStyle = props => {
{Device.android && <Icon slot="media" icon="icon-create-style"></Icon>} {Device.android && <Icon slot="media" icon="icon-create-style"></Icon>}
</ListItem> </ListItem>
</List> </List>
<List className={activeStyle}> <List>
{paragraphStyles.map((style, index) => ( {paragraphStyles.map((style, index) => (
<ListItem <ListItem
key={index} key={index}
@ -345,13 +343,12 @@ const ChangeNextParagraphStyle = props => {
const storeParagraphSettings = props.storeParagraphSettings; const storeParagraphSettings = props.storeParagraphSettings;
const paragraphStyles = storeParagraphSettings.paragraphStyles; const paragraphStyles = storeParagraphSettings.paragraphStyles;
const thumbSize = storeParagraphSettings.styleThumbSize; const thumbSize = storeParagraphSettings.styleThumbSize;
const activeStyle = Device.android ? 'link no-active-state' : 'no-active-state';
const [newParagraph, setParagraph] = useState(nextParagraphStyle); const [newParagraph, setParagraph] = useState(nextParagraphStyle);
return ( return (
<Page> <Page>
<Navbar title={t('Edit.textNextParagraphStyle')} backLink={_t.textBack}></Navbar> <Navbar title={t('Edit.textNextParagraphStyle')} backLink={_t.textBack}></Navbar>
<List className={activeStyle}> <List>
<ListItem style={{paddingLeft: '5px'}} radio radioIcon="start" checked={!newParagraph} onClick={() => { <ListItem style={{paddingLeft: '5px'}} radio radioIcon="start" checked={!newParagraph} onClick={() => {
if(newParagraph) { if(newParagraph) {
setParagraph(''); setParagraph('');