diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less
index a4cb668a7c..41f7cfb42d 100644
--- a/apps/documenteditor/mobile/src/less/app.less
+++ b/apps/documenteditor/mobile/src/less/app.less
@@ -285,7 +285,7 @@
color: @text-normal;
font-size: 16px;
}
- .calendar-day-selected .calendar-day-number {
+ .calendar-day-selected .calendar-day-number, .calendar-day-today.calendar-day-selected .calendar-day-number {
border: 1px solid transparent;
background-color: @brandColor;
color: @fill-white;
diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx
index 95c3468f3f..47c8267a66 100644
--- a/apps/documenteditor/mobile/src/view/Toolbar.jsx
+++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx
@@ -76,7 +76,7 @@ const ToolbarView = props => {
})}
{/*props.displayCollaboration &&*/}
{Device.phone ? null : }
- {window.matchMedia("(min-width: 360px)").matches ? props.openOptions('coauth')}> : null}
+ {window.matchMedia("(min-width: 360px)").matches && docExt !== 'oform' ? props.openOptions('coauth')}> : null}
props.openOptions('settings')}>
diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index 01897e7548..6d0638773b 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -306,29 +306,32 @@ const PageBulletsAndNumbers = props => {
}
-
-
-
-
-
-
-
-
-
-
-
+
)
};
diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
index 60bda1764f..f7d9d9af6f 100644
--- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
@@ -96,7 +96,7 @@ const routes = [
];
-const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => {
+const SettingsList = inject("storeAppOptions", "storeReview", "storeDocumentInfo")(observer(props => {
const { t } = useTranslation();
const _t = t('Settings', {returnObjects: true});
const appOptions = props.storeAppOptions;
@@ -106,6 +106,9 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
const navbar =
{!props.inPopover && {_t.textDone}}
;
+ const docInfo = props.storeDocumentInfo;
+ const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : '';
+ const isNotForm = docExt && docExt !== 'oform';
const onoptionclick = page => {
if ( props.onOptionClick )
@@ -211,10 +214,12 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
}
-
-
-
+ {isNotForm &&
+
+
+
+ }
{_canDownload &&
@@ -238,7 +243,7 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
}
- {_canAbout &&
+ {(_canAbout && isNotForm) &&
diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less
index 2f6739b8d5..b0433a9f9f 100644
--- a/apps/spreadsheeteditor/mobile/src/less/app.less
+++ b/apps/spreadsheeteditor/mobile/src/less/app.less
@@ -266,4 +266,11 @@
display: none;
}
}
-}
\ No newline at end of file
+}
+
+// Marker color sheet
+.marker-color-sheet {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+}
diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
index 9491a10f7f..6f310dc078 100644
--- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
@@ -37,7 +37,7 @@ const PageListMove = props => {
)
};
-const PageAllList = (props) => {
+const PageAllList = observer((props) => {
const { t } = useTranslation();
const { sheets, onTabListClick } = props;
const allSheets = sheets.sheets;
@@ -65,18 +65,21 @@ const PageAllList = (props) => {
{allSheets.map((model, sheetIndex) =>
onTabListClick(sheetIndex)}>
- {model.hidden ?
-
- {t('Statusbar.textHidden')}
-
- : null}
- )
- }
+
+ {model.hidden ?
+ t('Statusbar.textHidden')
+ :
+
+ }
+
+
+ )}
)
-};
+});
const PageCustomTabColor = inject("storePalette")(observer (props => {
const { t } = useTranslation();