diff --git a/apps/common/mobile/lib/view/Draw.jsx b/apps/common/mobile/lib/view/Draw.jsx index 5fc6dfd133..0146812f2f 100644 --- a/apps/common/mobile/lib/view/Draw.jsx +++ b/apps/common/mobile/lib/view/Draw.jsx @@ -16,7 +16,7 @@ export const DrawView = ({ currentTool, setTool, settings, setSettings, colors, return ( - f7.sheet.open('.draw-sheet--settings')}> + f7.sheet.open('.draw-sheet--settings')}>
{_t.textCustomColor}
- +
@@ -52,14 +52,14 @@ export const DrawView = ({ currentTool, setTool, settings, setSettings, colors,
{_t.textLineSize}
- {Device.android ? ( + {/*{Device.android ? (*/} setSettings({ lineSize: value })} /> - ) : ( - setSettings({ lineSize: parseInt(e.target.value) })} /> - )} + {/*) : (*/} + {/* setSettings({ lineSize: parseInt(e.target.value) })} />*/} + {/* )}*/}
{_t.textOpacity}
diff --git a/apps/common/mobile/resources/less/draw.less b/apps/common/mobile/resources/less/draw.less index c5ebd5cc29..8d1a2bc995 100644 --- a/apps/common/mobile/resources/less/draw.less +++ b/apps/common/mobile/resources/less/draw.less @@ -103,7 +103,7 @@ .device-ios & { top: 100vh; - margin-top: calc(-1 * (var(--height) + env(keyboard-inset-top))); + margin-top: calc(-1 * (var(--height) + env(keyboard-inset-top, 0px))); } .draw-toolbar { @@ -153,7 +153,7 @@ appearance: none; width: 100%; height: 24px; - background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQzIiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMzQzIDI0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMCAxMkMwIDEwLjg4NjEgMC44ODU3NSA5Ljk3NDE4IDEuOTk5MTUgOS45NDE3MkwzMzEuMDA1IDAuMzQ5NzA2QzMzNy41NzIgMC4xNTgyNCAzNDMgNS40Mjk5MiAzNDMgMTJDMzQzIDE4LjU3MDEgMzM3LjU3MiAyMy44NDE4IDMzMS4wMDUgMjMuNjUwM0wxLjk5OTE1IDE0LjA1ODNDMC44ODU3NTQgMTQuMDI1OCAwIDEzLjExMzkgMCAxMloiIGZpbGw9IiNBRUFFQjIiLz4KPC9zdmc+Cg==); + background: url(data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJub25lIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDM0MyAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTAgMTJDMCAxMC44ODYxIDAuODg1NzUgOS45NzQxOCAxLjk5OTE1IDkuOTQxNzJMMzMxLjAwNSAwLjM0OTcwNkMzMzcuNTcyIDAuMTU4MjQgMzQzIDUuNDI5OTIgMzQzIDEyQzM0MyAxOC41NzAxIDMzNy41NzIgMjMuODQxOCAzMzEuMDA1IDIzLjY1MDNMMS45OTkxNSAxNC4wNTgzQzAuODg1NzU0IDE0LjAyNTggMCAxMy4xMTM5IDAgMTJaIiBmaWxsPSIjQUVBRUIyIi8+Cjwvc3ZnPgo=); background-size: 100% 24px; background-repeat: no-repeat; } diff --git a/apps/documenteditor/mobile/src/view/add/AddOther.jsx b/apps/documenteditor/mobile/src/view/add/AddOther.jsx index e94fffa140..f9ff2d3941 100644 --- a/apps/documenteditor/mobile/src/view/add/AddOther.jsx +++ b/apps/documenteditor/mobile/src/view/add/AddOther.jsx @@ -216,14 +216,12 @@ const AddOther = props => { } - {!Device.ios && ( - { - props.closeModal(); - Common.Notifications.trigger('draw:start'); - }}> - - - )} + { + props.closeModal(); + Common.Notifications.trigger('draw:start'); + }}> + + ) }; diff --git a/apps/presentationeditor/mobile/src/less/app-ios.less b/apps/presentationeditor/mobile/src/less/app-ios.less index 84d3fca96b..613bce3362 100644 --- a/apps/presentationeditor/mobile/src/less/app-ios.less +++ b/apps/presentationeditor/mobile/src/less/app-ios.less @@ -4,5 +4,9 @@ background: @background-tertiary; } } + + .back-reader-mode { + margin-left: 10px; + } } diff --git a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx index 590e77131d..b725662e9c 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx @@ -73,14 +73,12 @@ const AddOther = props => { } - {!Device.ios && ( - { - props.closeModal(); - Common.Notifications.trigger('draw:start'); - }}> - - - )} + { + props.closeModal(); + Common.Notifications.trigger('draw:start'); + }}> + + ) }; diff --git a/apps/spreadsheeteditor/mobile/src/less/app-ios.less b/apps/spreadsheeteditor/mobile/src/less/app-ios.less index ae6b7a3733..4a12964c6f 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/app-ios.less @@ -36,4 +36,8 @@ overflow: hidden; } } + + .back-reader-mode { + margin-left: 10px; + } } diff --git a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx index f8311e5b52..a69b4ed056 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx @@ -32,7 +32,7 @@ const ToolbarView = props => { return ( - {props.isDrawMode && Common.Notifications.trigger('draw:stop')}/>} + {props.isDrawMode && Common.Notifications.trigger('draw:stop')}/>} {(!props.isDrawMode && props.isShowBack && !isVersionHistoryMode) && Common.Notifications.trigger('goback')}>} {isVersionHistoryMode ? { e.preventDefault(); diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddOther.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddOther.jsx index f35bf029ee..9a1161c702 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddOther.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddOther.jsx @@ -37,14 +37,12 @@ const AddOther = inject("storeFocusObjects", "storeAppOptions")(observer(props = }}> - {!Device.ios && ( { props.closeModal(); Common.Notifications.trigger('draw:start'); }}> - )} ) }));