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

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

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2022-01-26 22:43:55 +03:00 committed by GitHub
parent f74ed73317 49e5d3ff6e
commit ad011826f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -909,15 +909,6 @@ input[type="number"]::-webkit-inner-spin-button {
} }
} }
} }
.function-info {
p {
color: @text-secondary;
}
h3 {
font-weight: 500;
color: @text-normal;
}
}
} }
} }
} }

14
apps/spreadsheeteditor/mobile/src/less/app.less
View file

@ -54,13 +54,21 @@
//--f7-page-content-extra-padding-top: 37px; //--f7-page-content-extra-padding-top: 37px;
} }
.function-info {
padding: 0 15px;
}
.page-function-info { .page-function-info {
&.page-content, .page-content { &.page-content, .page-content {
background-color: @background-primary; background-color: @background-primary;
} }
.function-info {
padding: 0 15px;
h3 {
color: @text-normal;
}
p {
color: @text-secondary;
}
}
} }
.username-tip.active { .username-tip.active {

20
apps/spreadsheeteditor/mobile/src/less/statusbar.less
View file

@ -61,14 +61,18 @@
} }
} }
i.icon { .tab {
width: 22px; i.icon {
height: 22px; width: 18px;
&.icon-plus { height: 18px;
// @source: '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>'; &.icon-plus.bold{
// .encoded-svg-mask(@source, @fontColor);
// background-image: none; // @source: '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>';
.encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 22 22"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>') // .encoded-svg-mask(@source, @fontColor);
// background-image: none;
.encoded-svg-mask('<svg viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M16 9.98658H9.98658V16H8.01342V9.98658H2V8.01342H8.01342V2H9.98658V8.01342H16V9.98658Z" fill="black"/></svg>')
}
} }
} }
} }

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

@ -73,7 +73,7 @@ const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(prop
{isEdit && {isEdit &&
<div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}> <div id="idx-box-add-tab" className={`${isDisconnected || isWorkbookLocked || isProtectedWorkbook ? 'disabled' : ''}`}>
<Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}> <Link href={false} id="idx-btn-addtab" className={`tab${isDisabledEditSheet || isDisconnected || isWorkbookLocked || isProtectedWorkbook ? ' disabled' : ''}`} onClick={props.onAddTabClicked}>
<Icon className="icon icon-plus" /> <Icon className={`icon icon-plus ${isAndroid ? 'bold' : ''}`}/>
</Link> </Link>
</div> </div>
} }

4
apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
View file

@ -44,6 +44,7 @@ const EditCell = props => {
onFontSize: props.onFontSize, onFontSize: props.onFontSize,
onFontClick: props.onFontClick onFontClick: props.onFontClick
}}/> }}/>
</List>
{!wsProps.FormatCells && {!wsProps.FormatCells &&
<> <>
<List> <List>
@ -127,8 +128,7 @@ const EditCell = props => {
)})} )})}
</Swiper> </Swiper>
) : null} ) : null}
</>} </>}
</List>
</Fragment> </Fragment>
) )
}; };