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

Merge branch 'release/v7.0.0' of https://github.com/ONLYOFFICE/web-apps into release/v7.0.0

Browse source
This commit is contained in:
Maxim Kadushkin 2021-12-10 16:38:32 +03:00
parent 7680c381b0 a909e7dc5b
commit dfc359f0ef
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/view/Search.jsx
View file

@ -262,7 +262,7 @@ class SearchView extends Component {
<div className="searchbar-inner__center"> <div className="searchbar-inner__center">
<div className="searchbar-input-wrap"> <div className="searchbar-input-wrap">
<input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255" <input className="searchbar-input" value={searchQuery} placeholder={_t.textSearch} type="search" maxLength="255"
onChange={e => {this.changeSearchQuery(e.target.value)}} /> onChange={e => {this.changeSearchQuery(e.target.value)}} autoFocus/>
{isIos ? <i className="searchbar-icon" /> : null} {isIos ? <i className="searchbar-icon" /> : null}
<span className="input-clear-button" onClick={() => this.changeSearchQuery('')} /> <span className="input-clear-button" onClick={() => this.changeSearchQuery('')} />
</div> </div>

2
apps/common/mobile/lib/view/collaboration/Comments.jsx
View file

@ -60,7 +60,7 @@ const AddCommentPopup = inject("storeComments")(observer(props => {
<div className='name'>{userInfo.name}</div> <div className='name'>{userInfo.name}</div>
</div> </div>
<div className='wrap-textarea'> <div className='wrap-textarea'>
<Input className="input-comment" type='textarea' placeholder={_t.textAddComment} value={stateText} onChange={(event) => {setText(event.target.value);}}></Input> <Input className="input-comment" autofocus type='textarea' placeholder={_t.textAddComment} value={stateText} onChange={(event) => {setText(event.target.value);}}></Input>
</div> </div>
</div> </div>
</Popup> </Popup>

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

@ -888,6 +888,16 @@ input[type="number"]::-webkit-inner-spin-button {
height: 100%; height: 100%;
} }
.dropdown-list {
&__placeholder {
opacity: 0.6;
.item-inner {
border-bottom: 1px solid var(--f7-list-item-border-color);
}
}
}

4
apps/documenteditor/mobile/src/view/DropdownList.jsx
View file

@ -8,9 +8,9 @@ const PageDropdownList = props => {
return ( return (
<View style={props.style}> <View style={props.style}>
<Page> <Page>
<List> <List className="dropdown-list">
{listItems.length && listItems.map((elem, index) => ( {listItems.length && listItems.map((elem, index) => (
<ListItem key={index} className='no-indicator' style={index === 0 ? {opacity: 0.6} : null} title={elem.caption} onClick={() => props.onChangeItemList(elem.value)}></ListItem> <ListItem key={index} className={'no-indicator ' + (index === 0 ? 'dropdown-list__placeholder' : '')} title={elem.caption} onClick={() => props.onChangeItemList(elem.value)}></ListItem>
))} ))}
</List> </List>
</Page> </Page>