Skip to content

Commit

Permalink
Merge pull request 'feature/mobile-send-form' (#70) from feature/mobi…
Browse files Browse the repository at this point in the history
…le-send-form into release/v8.2.0
  • Loading branch information
maxkadushkin committed Oct 8, 2024
2 parents 6f4ba60 + a1038c4 commit bcc70f8
Showing 15 changed files with 37 additions and 50 deletions.
5 changes: 5 additions & 0 deletions apps/common/mobile/resources/less/ios/icons.less
Original file line number Diff line number Diff line change
@@ -55,5 +55,10 @@
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.5 7.79289L14.3536 10.6464L13.6465 11.3536L12 9.7071V16H14.5V17H11V9.70713L9.35364 11.3536L8.64648 10.6464L11.5 7.79289Z" fill="@{brandColor}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M1 4C1 3.44772 1.44775 3 2 3L9.75 3L11.75 5L22 5C22.5522 5 23 5.44772 23 6L23 20C23 20.5523 22.5522 21 22 21L2 21C1.44775 21 1 20.5523 1 20L1 4ZM2 20L2 4L9.25 4L11.25 6L22 6L22 20L2 20Z" fill="@{brandColor}"/></svg>');
}
&.icon-settings {
width: 24px;
height: 24px;
.encoded-svg-mask('<svg viewBox="0 0 24 24" fill="@{brandColor}" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12ZM22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM15.5 12.25C15.5 11.5596 16.0596 11 16.75 11C17.4404 11 18 11.5596 18 12.25C18 12.9404 17.4404 13.5 16.75 13.5C16.0596 13.5 15.5 12.9404 15.5 12.25ZM12 11C11.3096 11 10.75 11.5596 10.75 12.25C10.75 12.9404 11.3096 13.5 12 13.5C12.6904 13.5 13.25 12.9404 13.25 12.25C13.25 11.5596 12.6904 11 12 11ZM7.25 11C6.55964 11 6 11.5596 6 12.25C6 12.9404 6.55964 13.5 7.25 13.5C7.94036 13.5 8.5 12.9404 8.5 12.25C8.5 11.5596 7.94036 11 7.25 11Z"/></svg>');
}
}
}
5 changes: 5 additions & 0 deletions apps/common/mobile/resources/less/material/icons.less
Original file line number Diff line number Diff line change
@@ -92,6 +92,11 @@
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.5 7.79289L14.3536 10.6464L13.6465 11.3536L12 9.7071V16H14.5V17H11V9.70713L9.35364 11.3536L8.64648 10.6464L11.5 7.79289Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M1 4C1 3.44772 1.44775 3 2 3H9.75L11.75 5H22C22.5522 5 23 5.44772 23 6V20C23 20.5523 22.5522 21 22 21H2C1.44775 21 1 20.5523 1 20V4ZM2 20V4H9.25L11.25 6H22V20H2Z"/></svg>', @toolbar-icons);
}
&.icon-settings {
width: 22px;
height: 22px;
.encoded-svg-mask('<svg viewBox="0 0 24 24" fill="@{toolbar-icons}" xmlns="http://www.w3.org/2000/svg"><path d="M12 3.25C11.0335 3.25 10.25 4.0335 10.25 5C10.25 5.9665 11.0335 6.75 12 6.75C12.9665 6.75 13.75 5.9665 13.75 5C13.75 4.0335 12.9665 3.25 12 3.25Z" fill="white"/><path d="M12 10.25C11.0335 10.25 10.25 11.0335 10.25 12C10.25 12.9665 11.0335 13.75 12 13.75C12.9665 13.75 13.75 12.9665 13.75 12C13.75 11.0335 12.9665 10.25 12 10.25Z" fill="white"/><path d="M12 17.25C11.0335 17.25 10.25 18.0335 10.25 19C10.25 19.9665 11.0335 20.75 12 20.75C12.9665 20.75 13.75 19.9665 13.75 19C13.75 18.0335 12.9665 17.25 12 17.25Z" fill="white"/></svg>', @toolbar-icons);
}
}
}
}
2 changes: 1 addition & 1 deletion apps/documenteditor/mobile/locale/en.json
Original file line number Diff line number Diff line change
@@ -780,7 +780,7 @@
"textSpellcheck": "Spell Checking",
"textStatistic": "Statistic",
"textSubject": "Subject",
"textSubmit": "Submit",
"del_textSubmit": "Submit",
"textSymbols": "Symbols",
"textTheme": "Theme",
"textTitle": "Title",
1 change: 1 addition & 0 deletions apps/documenteditor/mobile/src/controller/Toolbar.jsx
Original file line number Diff line number Diff line change
@@ -415,6 +415,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
saveForm={saveForm}
isForm={isForm}
canFillForms={canFillForms}
canSubmitForms={appOptions.canSubmitForms}
/>
)
}));
2 changes: 1 addition & 1 deletion apps/documenteditor/mobile/src/less/app-ios.less
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@
}
}

#btn-save-form {
#btn-submit-form {
background-color: @brand-form;
}
}
3 changes: 2 additions & 1 deletion apps/documenteditor/mobile/src/less/app.less
Original file line number Diff line number Diff line change
@@ -382,12 +382,13 @@
transition: opacity 300ms;
}
//
#btn-save-form {
#btn-submit-form {
background-color: @toolbar-icons;
color: @toolbar-background;
height: 2em;
border-radius: 1em;
padding-left: 15px;
padding-right: 15px;
margin-right: 5px;
}

2 changes: 1 addition & 1 deletion apps/documenteditor/mobile/src/less/icons-common.less
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ i.icon {
&.icon-save-form {
width: 24px;
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill-rule="evenodd" clip-rule="evenodd" d="M3 5C3 3.89543 3.89543 3 5 3H15.3787C15.9091 3 16.4178 3.21071 16.7929 3.58579L20.4142 7.20711C20.7893 7.58218 21 8.09089 21 8.62132V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V5ZM5 4C4.44772 4 4 4.44772 4 5V19C4 19.5523 4.44772 20 5 20H6V14C6 12.8954 6.89543 12 8 12H16C17.1046 12 18 12.8954 18 14V20H19C19.5523 20 20 19.5523 20 19V8.62132C20 8.3561 19.8946 8.10175 19.7071 7.91421L15.7929 4H15V7C15 7.55228 14.5523 8 14 8H8C7.44772 8 7 7.55228 7 7V4H5ZM13 4V7H14V4H13ZM17 20V14C17 13.4477 16.5523 13 16 13H8C7.44772 13 7 13.4477 7 14V20H17ZM15 15C15.2761 15 15.5 15.2239 15.5 15.5C15.5 15.7761 15.2761 16 15 16H9C8.72386 16 8.5 15.7761 8.5 15.5C8.5 15.2239 8.72386 15 9 15H15ZM12.5 17.5C12.5 17.7761 12.2761 18 12 18H9C8.72386 18 8.5 17.7761 8.5 17.5C8.5 17.2239 8.72386 17 9 17H12C12.2761 17 12.5 17.2239 12.5 17.5Z"/></svg>')
.encoded-svg-mask('<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.9998 16H12.9998L12.9998 2L16.5998 5.7L17.2998 4.9L12.4998 0L7.6998 4.9L8.3998 5.7L11.9998 2L11.9998 16ZM10 8H4V23H21V8H15V9H20V22H5V9H10V8Z" fill="#AA5252"/></svg>');
}
&.icon-add-favorites {
width: 24px;
5 changes: 0 additions & 5 deletions apps/documenteditor/mobile/src/less/icons-ios.less
Original file line number Diff line number Diff line change
@@ -20,11 +20,6 @@
height: 22px;
.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="@{brandColor}"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>');
}
&.icon-settings {
width: 24px;
height: 24px;
.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="@{brandColor}"><g><path d="M11.8,3l0.4,2c0.1,0.7,0.6,1.1,1.3,1.1c0.3,0,0.5-0.1,0.7-0.2l1.9-1.2l1.1,1.1l-1.1,1.8C15.8,8,15.8,8.5,16,8.9c0.2,0.4,0.5,0.7,1,0.8l2.1,0.5v1.6L17,12.2c-0.5,0.1-0.8,0.4-1,0.8c-0.2,0.4-0.1,0.9,0.1,1.2l1.2,1.9l-1.1,1.1l-1.8-1.1c-0.2-0.2-0.5-0.2-0.8-0.2c-0.6,0-1.2,0.5-1.3,1.1l-0.5,2.1h-1.6l-0.4-2C9.7,16.4,9.2,16,8.5,16c-0.3,0-0.5,0.1-0.7,0.2l-1.9,1.2l-1.1-1.1l1.1-1.8c0.3-0.4,0.3-0.9,0.1-1.3c-0.2-0.4-0.5-0.7-1-0.8l-2.1-0.5v-1.6l2-0.4c0.5-0.1,0.8-0.4,1-0.8C6.1,8.7,6,8.2,5.8,7.9l-1-2l1.1-1.1l1.8,1.1C8,6.1,8.2,6.2,8.5,6.2c0.6,0,1.2-0.5,1.3-1.1L10.3,3H11.8 M11,15.5c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5s-4.5,2-4.5,4.5S8.5,15.5,11,15.5 M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2c-0.1,0-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5c-0.1,0-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>');
}
&.icon-expand-down {
width: 22px;
height: 22px;
7 changes: 1 addition & 6 deletions apps/documenteditor/mobile/src/less/icons-material.less
Original file line number Diff line number Diff line change
@@ -21,11 +21,6 @@
height: 22px;
.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="@{toolbar-icons}"><g><path d="M21,12h-9v9h-2v-9H1v-2h9V1h2v9h9V12z"/></g></svg>', @toolbar-icons);
}
&.icon-settings {
width: 22px;
height: 22px;
.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="@{toolbar-icons}"><g><path d="M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2s-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5s-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>', @toolbar-icons);
}
&.icon-prev {
width: 20px;
height: 20px;
@@ -98,7 +93,7 @@
&.icon-save-form {
width: 24px;
height: 24px;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill-rule="evenodd" clip-rule="evenodd" d="M3 5C3 3.89543 3.89543 3 5 3H15.3787C15.9091 3 16.4178 3.21071 16.7929 3.58579L20.4142 7.20711C20.7893 7.58218 21 8.09089 21 8.62132V19C21 20.1046 20.1046 21 19 21H5C3.89543 21 3 20.1046 3 19V5ZM5 4C4.44772 4 4 4.44772 4 5V19C4 19.5523 4.44772 20 5 20H6V14C6 12.8954 6.89543 12 8 12H16C17.1046 12 18 12.8954 18 14V20H19C19.5523 20 20 19.5523 20 19V8.62132C20 8.3561 19.8946 8.10175 19.7071 7.91421L15.7929 4H15V7C15 7.55228 14.5523 8 14 8H8C7.44772 8 7 7.55228 7 7V4H5ZM13 4V7H14V4H13ZM17 20V14C17 13.4477 16.5523 13 16 13H8C7.44772 13 7 13.4477 7 14V20H17ZM15 15C15.2761 15 15.5 15.2239 15.5 15.5C15.5 15.7761 15.2761 16 15 16H9C8.72386 16 8.5 15.7761 8.5 15.5C8.5 15.2239 8.72386 15 9 15H15ZM12.5 17.5C12.5 17.7761 12.2761 18 12 18H9C8.72386 18 8.5 17.7761 8.5 17.5C8.5 17.2239 8.72386 17 9 17H12C12.2761 17 12.5 17.2239 12.5 17.5Z"/></svg>', @toolbar-icons);
.encoded-svg-mask('<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M11.9998 16H12.9998L12.9998 2L16.5998 5.7L17.2998 4.9L12.4998 0L7.6998 4.9L8.3998 5.7L11.9998 2L11.9998 16ZM10 8H4V23H21V8H15V9H20V22H5V9H10V8Z" fill="#AA5252"/></svg>', @toolbar-icons);
}
}
}
23 changes: 20 additions & 3 deletions apps/documenteditor/mobile/src/view/Toolbar.jsx
Original file line number Diff line number Diff line change
@@ -91,9 +91,26 @@ const ToolbarView = props => {
] : [
<Link key='prev-field-link' className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'} id='btn-prev-field' icon='icon-prev-field' href={false} onClick={() => props.movePrevField()}></Link>,
<Link key='next-field-link' className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'} id='btn-next-field' icon='icon-next-field' href={false} onClick={() => props.moveNextField()}></Link>,
<Link key='btn-settings' className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>,
<Link id='btn-save-form' key='save-form-link' className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'}
text={t("Toolbar.btnSend")} /*icon='icon-save-form'*/ href={false} onClick={() => props.saveForm()}></Link>,
(props.canSubmitForms ?
[
<Link key='btn-settings'
className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'}
icon='icon-settings' href={false}
onClick={() => props.openOptions('settings')}></Link>,
<Link key='send-form-link'
id='btn-submit-form'
className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'}
text={t("Toolbar.btnSend")} href={false}
onClick={() => props.saveForm()}></Link>
] : [
<Link key='save-form-link'
className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'}
icon='icon-save-form' href={false} onClick={() => props.saveForm()}></Link>,
<Link key='btn-settings'
className={(props.disabledSettings || props.disabledControls || isDisconnected || isOpenModal) && 'disabled'} id='btn-settings' icon='icon-settings'
href={false} onClick={() => {props.openOptions('settings')}}></Link>
]
)
]}
</NavRight>
</Fragment>
10 changes: 0 additions & 10 deletions apps/documenteditor/mobile/src/view/settings/SettingsPage.jsx
Original file line number Diff line number Diff line change
@@ -82,16 +82,6 @@ const SettingsPage = inject("storeAppOptions", "storeReview", "storeDocumentInfo
<Icon slot="media" icon={isFavorite ? "icon-remove-favorites" : "icon-add-favorites"}></Icon>
</ListItem>
: ''),
(canFillForms && canSubmitForms ?
<ListItem key='submit-form-link' title={t('Settings.textSubmit')} link='#' className='no-indicator' onClick={settingsContext.submitForm}>
<Icon slot="media" icon="icon-save-form"></Icon>
</ListItem>
: ''),
(_canDownload && canFillForms && !canSubmitForms ?
<ListItem key='save-form-link' title={t('Settings.textSave')} link='#' className='no-indicator' onClick={settingsContext.saveAsPdf}>
<Icon slot="media" icon="icon-save-form"></Icon>
</ListItem>
: ''),
<ListItem key='clear-all-fields-link' title={t('Settings.textClearAllFields')} link='#' className='no-indicator' onClick={settingsContext.clearAllFields}>
<Icon slot="media" icon="icon-clear-fields"></Icon>
</ListItem>
6 changes: 0 additions & 6 deletions apps/presentationeditor/mobile/src/less/icons-ios.less
Original file line number Diff line number Diff line change
@@ -61,12 +61,6 @@
.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" fill="@{brandColor}"><g><path d="M22,12H12v10h-1V12H1v-1h10V1h1v10h10V12z"/></g></svg>');
}

&.icon-settings {
width: 24px;
height: 24px;
.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" fill="@{brandColor}"><g><path d="M11.8,3l0.4,2c0.1,0.7,0.6,1.1,1.3,1.1c0.3,0,0.5-0.1,0.7-0.2l1.9-1.2l1.1,1.1l-1.1,1.8C15.8,8,15.8,8.5,16,8.9c0.2,0.4,0.5,0.7,1,0.8l2.1,0.5v1.6L17,12.2c-0.5,0.1-0.8,0.4-1,0.8c-0.2,0.4-0.1,0.9,0.1,1.2l1.2,1.9l-1.1,1.1l-1.8-1.1c-0.2-0.2-0.5-0.2-0.8-0.2c-0.6,0-1.2,0.5-1.3,1.1l-0.5,2.1h-1.6l-0.4-2C9.7,16.4,9.2,16,8.5,16c-0.3,0-0.5,0.1-0.7,0.2l-1.9,1.2l-1.1-1.1l1.1-1.8c0.3-0.4,0.3-0.9,0.1-1.3c-0.2-0.4-0.5-0.7-1-0.8l-2.1-0.5v-1.6l2-0.4c0.5-0.1,0.8-0.4,1-0.8C6.1,8.7,6,8.2,5.8,7.9l-1-2l1.1-1.1l1.8,1.1C8,6.1,8.2,6.2,8.5,6.2c0.6,0,1.2-0.5,1.3-1.1L10.3,3H11.8 M11,15.5c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5s-4.5,2-4.5,4.5S8.5,15.5,11,15.5 M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2c-0.1,0-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5c-0.1,0-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>');
}

&.icon-feedback {
width: 22px;
height: 22px;
6 changes: 0 additions & 6 deletions apps/presentationeditor/mobile/src/less/icons-material.less
Original file line number Diff line number Diff line change
@@ -467,12 +467,6 @@
.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" fill="@{toolbar-icons}"><g><path d="M4.0464363,2.9884553c0.006526,0.00296,0.0142345,0.006835,0.0231438,0.0119021 c0.5908604,0.3357637,12.7118397,7.2924433,13.8977489,8.0268402c-0.5831585,0.3417759-13.0137587,7.4879274-13.934659,7.9826727 L4.0464363,2.9884553 M3.9889357,2C3.4427795,2.0000577,3.000525,2.4533575,3.000525,3.015348 c0,0.573487,0,15.1632957,0,15.9945221C3.000525,19.622963,3.4796104,20,3.9940588,20 c0.1729372,0,0.3499191-0.0426311,0.5139763-0.1332226c0.8905602-0.491045,13.1880894-7.5583372,13.9407387-7.9994459 c0.6751213-0.3955202,0.6867313-1.337512,0-1.7326603C17.4031754,9.5333271,5.1523852,2.501852,4.5393953,2.1535165 C4.3526201,2.0472794,4.165401,1.9999813,3.9889357,2L3.9889357,2z"/></g></svg>', @toolbar-icons);
}

&.icon-settings {
width: 22px;
height: 22px;
.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" fill="@{toolbar-icons}"><g><path d="M12.1,2H9.9C9.6,2,9.4,2.2,9.3,2.5L8.8,4.9c0,0.2-0.2,0.3-0.3,0.3s-0.1,0-0.2-0.1L6.2,3.8C6.1,3.7,6,3.7,5.8,3.7c-0.1,0-0.3,0-0.4,0.1L3.8,5.4c-0.1,0.2-0.2,0.5,0,0.8l1.3,2.1c0.1,0.2,0.1,0.4-0.2,0.5L2.5,9.3C2.2,9.4,2,9.6,2,9.9v2.2c0,0.3,0.2,0.5,0.5,0.6l2.4,0.5c0.3,0.1,0.4,0.3,0.2,0.5l-1.3,2.1c-0.2,0.2-0.1,0.6,0.1,0.8l1.6,1.6c0.1,0.1,0.3,0.2,0.4,0.2s0.2,0,0.3-0.1L8.3,17c0.1-0.1,0.1-0.1,0.2-0.1s0.3,0.1,0.3,0.3l0.5,2.3C9.4,19.8,9.6,20,9.9,20h2.2c0.3,0,0.5-0.2,0.6-0.5l0.5-2.4c0-0.2,0.1-0.3,0.3-0.3c0.1,0,0.1,0,0.2,0.1l2.1,1.3c0.1,0.1,0.2,0.1,0.3,0.1c0.2,0,0.3-0.1,0.4-0.2l1.6-1.6c0.2-0.2,0.2-0.5,0.1-0.8l-1.3-2.1c-0.2-0.2-0.1-0.5,0.2-0.5l2.4-0.5c0.3-0.1,0.5-0.3,0.5-0.6V9.8c0-0.3-0.2-0.5-0.5-0.6l-2.4-0.5c-0.3-0.1-0.4-0.3-0.2-0.5l1.3-2.1c0.2-0.2,0.1-0.6-0.1-0.8l-1.6-1.6c-0.1-0.1-0.3-0.2-0.4-0.2s-0.2,0-0.3,0.1l-2.1,1.3C13.6,5,13.6,5,13.5,5s-0.3-0.1-0.3-0.3l-0.5-2.2C12.6,2.2,12.4,2,12.1,2L12.1,2z M11,14.5c-1.9,0-3.5-1.6-3.5-3.5S9.1,7.5,11,7.5s3.5,1.6,3.5,3.5S12.9,14.5,11,14.5L11,14.5z"/></g></svg>', @toolbar-icons);
}

&.icon-prev {
width: 20px;
height: 20px;
Loading

0 comments on commit bcc70f8

Please sign in to comment.