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

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

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-11-16 13:19:17 +03:00 committed by GitHub
parent 3c37145601 249796d6a1
commit cd691158bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/mobile/resources/less/icons.less
View file

File diff suppressed because one or more lines are too long

2
apps/common/mobile/resources/less/material/icons.less
View file

@ -32,7 +32,7 @@
&.icon-collaboration {
width: 24px;
height: 24px;
.encoded-svg-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M14.9912 6C14.9912 8.18203 14.4464 9.76912 13.7789 10.7492C13.101 11.7447 12.4042 12 11.9912 12C11.5782 12 10.8814 11.7447 10.2035 10.7492C9.53601 9.76912 8.99121 8.18203 8.99121 6C8.99121 4.23017 10.4571 3 11.9912 3C13.5254 3 14.9912 4.23017 14.9912 6ZM13.4917 13.6397C13.0059 13.8771 12.4989 14 11.9912 14C11.4861 14 10.9817 13.8784 10.4983 13.6434C8.53188 14.3681 6.94518 15.0737 5.78927 15.7768C4.10512 16.8011 4 17.4079 4 17.5C4 17.7664 4.1014 18.3077 5.27104 18.8939C6.50029 19.5099 8.64545 19.9999 12 20C15.3546 20 17.4997 19.5099 18.7289 18.8939C19.8986 18.3078 20 17.7664 20 17.5C20 17.4079 19.8949 16.8011 18.2107 15.7768C17.0529 15.0726 15.4627 14.3657 13.4917 13.6397ZM15.2272 12.1594C16.2765 10.7825 16.9912 8.67814 16.9912 6C16.9912 3 14.5 1 11.9912 1C9.48242 1 6.99121 3 6.99121 6C6.99121 8.68159 7.70777 10.7879 8.75931 12.1647C4.60309 13.7964 2 15.4951 2 17.5C2 19.9852 5 21.9999 12 22C19 22 22 19.9852 22 17.5C22 15.4929 19.3913 13.7927 15.2272 12.1594Z"/></svg>', @toolbar-icons);
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g clip-path="url(#clip0_4309_12598)"><path fill-rule="evenodd" clip-rule="evenodd" d="M7.49999 14C4.67677 14 2.51136 15.4069 1.40113 17.2572C0.840114 18.1923 1.00119 18.562 1.10243 18.6903C1.25554 18.8844 1.60969 19 1.97238 19H7.5V20H1.97238C1.50174 20 0.75589 19.8656 0.317329 19.3097C-0.173093 18.688 -0.0953502 17.8077 0.543635 16.7428C1.8334 14.5931 4.3232 13 7.49999 13V14ZM7.49999 13C10.6768 13 13.139 14.5931 14.4287 16.7428C15.0677 17.8077 15.1455 18.688 14.655 19.3097C14.2165 19.8656 13.4706 20 13 20H7.5V19H13C13.3627 19 13.7168 18.8844 13.8699 18.6903C13.9712 18.562 14.1323 18.1923 13.5712 17.2572C12.461 15.4069 10.3232 14 7.49999 14V13Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15 20H22.0007C22.4714 20 23.2172 19.8656 23.6558 19.3097C24.1462 18.688 24.0685 17.8077 23.4295 16.7428C22.1397 14.5931 19.6775 13 16.5007 13C15.2069 13 14.1778 13.164 13.1465 13.6225C13.5096 13.9033 13.7857 14.1169 14.1435 14.3553C14.8626 14.1272 15.6519 14 16.5007 14C19.3239 14 21.4617 15.4069 22.572 17.2572C23.133 18.1923 22.9719 18.562 22.8707 18.6903C22.7176 18.8844 22.3634 19 22.0007 19H16.5C16.4511 19.1093 16.3884 19.2127 16.3119 19.3097C16.2637 19.3708 16.2117 19.4268 16.1568 19.4782C15.7126 19.8935 15.4189 20 15 20Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.50001 11C8.75947 11 10 9.78646 10 8C10 6.21354 8.75947 5 7.50001 5C6.24055 5 5.00001 6.21354 5.00001 8C5.00001 9.78646 6.24055 11 7.50001 11ZM7.50001 12C9.433 12 11 10.2091 11 8C11 5.79086 9.433 4 7.50001 4C5.56701 4 4.00001 5.79086 4.00001 8C4.00001 10.2091 5.56701 12 7.50001 12Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M17 11C17.9655 11 19 10.0309 19 8.5C19 6.96911 17.9655 6 17 6C16.0345 6 15 6.96911 15 8.5C15 10.0309 16.0345 11 17 11ZM17 12C18.6569 12 20 10.433 20 8.5C20 6.567 18.6569 5 17 5C15.3432 5 14 6.567 14 8.5C14 10.433 15.3432 12 17 12Z" fill="black"/></g><defs><clipPath id="clip0_4309_12598"><rect width="24" height="24" fill="white"/></clipPath></defs></svg>', @toolbar-icons);
}
&.icon-edit {
width: 22px;

2
apps/documenteditor/mobile/src/view/Toolbar.jsx
View file

@ -79,7 +79,7 @@ const ToolbarView = props => {
})}
{/*props.displayCollaboration &&*/}
{Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
{!Device.phone ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => props.openOptions('coauth')}></Link> : null}
{window.matchMedia("(min-width: 360px)").matches ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => props.openOptions('coauth')}></Link> : null}
<Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={e => props.openOptions('settings')}></Link>
</NavRight>
</Fragment>