Skip to content

Commit

Permalink
Merge pull request #2944 from ONLYOFFICE/feature/fix-bugs
Browse files Browse the repository at this point in the history
[DE mobile] Fix Bug 65783
  • Loading branch information
maxkadushkin authored Apr 18, 2024
2 parents 6aac85d + c926a42 commit f2b679e
Show file tree
Hide file tree
Showing 41 changed files with 2,299 additions and 38 deletions.
8 changes: 8 additions & 0 deletions apps/common/mobile/resources/less/colors-table-dark.less
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,12 @@
//--canvas-scroll-thumb-target-hover: #404040;
//--canvas-scroll-thumb-target-pressed: #404040;
}

.theme-type-dark.pdf-view, .theme-dark.pdf-view {
--brand-word: var(--brand-form);

&__android {
--toolbar-background: var(--background-primary);
}
}
}
7 changes: 7 additions & 0 deletions apps/common/mobile/resources/less/colors-table.less
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@
//--canvas-scroll-thumb-target: #c0c0c0;
//--canvas-scroll-thumb-target-hover: #f7f7f7;
//--canvas-scroll-thumb-target-pressed: #f7f7f7;
.pdf-view {
--brand-word: var(--brand-form);

&__android {
--toolbar-background: var(--brand-word);
}
}
}

@brand-word: var(--brand-word);
Expand Down
6 changes: 5 additions & 1 deletion apps/documenteditor/mobile/src/controller/Main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,11 @@ class MainController extends Component {

changeEditorBrandColorForPdf() {
const bodyElement = document.body;
bodyElement.style.setProperty('--brand-word', 'var(--brand-form)');
bodyElement.classList.add('pdf-view');

if(Device.android) {
bodyElement.classList.add('pdf-view__android');
}
}

applyMode (appOptions) {
Expand Down
61 changes: 60 additions & 1 deletion apps/spreadsheeteditor/mobile/locale/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,66 @@
"Values": "Values",
"X Axis": "X Axis",
"Y Axis": "Y Axis",
"Years": "Years"
"Years": "Years",
"del_txtAccent": "Accent",
"del_txtAll": "(All)",
"del_txtArt": "Your text here",
"del_txtBlank": "(blank)",
"del_txtByField": "%1 of %2",
"del_txtClearFilter": "Clear Filter (Alt+C)",
"del_txtColLbls": "Column Labels",
"del_txtColumn": "Column",
"del_txtConfidential": "Confidential",
"del_txtDate": "Date",
"del_txtDays": "Days",
"del_txtDiagramTitle": "Chart Title",
"del_txtFile": "File",
"del_txtGrandTotal": "Grand Total",
"del_txtGroup": "Group",
"del_txtHours": "Hours",
"del_txtMinutes": "Minutes",
"del_txtMonths": "Months",
"del_txtMultiSelect": "Multi-Select (Alt+S)",
"del_txtOr": "%1 or %2",
"del_txtPage": "Page",
"del_txtPageOf": "Page %1 of %2",
"del_txtPages": "Pages",
"del_txtPreparedBy": "Prepared by",
"del_txtPrintArea": "Print_Area",
"del_txtQuarter": "Qtr",
"del_txtQuarters": "Quarters",
"del_txtRow": "Row",
"del_txtRowLbls": "Row Labels",
"del_txtSeconds": "Seconds",
"del_txtSeries": "Series",
"del_txtStyle_Bad": "Bad",
"del_txtStyle_Calculation": "Calculation",
"del_txtStyle_Check_Cell": "Check Cell",
"del_txtStyle_Comma": "Comma",
"del_txtStyle_Currency": "Currency",
"del_txtStyle_Explanatory_Text": "Explanatory Text",
"del_txtStyle_Good": "Good",
"del_txtStyle_Heading_1": "Heading 1",
"del_txtStyle_Heading_2": "Heading 2",
"del_txtStyle_Heading_3": "Heading 3",
"del_txtStyle_Heading_4": "Heading 4",
"del_txtStyle_Input": "Input",
"del_txtStyle_Linked_Cell": "Linked Cell",
"del_txtStyle_Neutral": "Neutral",
"del_txtStyle_Normal": "Normal",
"del_txtStyle_Note": "Note",
"del_txtStyle_Output": "Output",
"del_txtStyle_Percent": "Percent",
"del_txtStyle_Title": "Title",
"del_txtStyle_Total": "Total",
"del_txtStyle_Warning_Text": "Warning Text",
"del_txtTab": "Tab",
"del_txtTable": "Table",
"del_txtTime": "Time",
"del_txtValues": "Values",
"del_txtXAxis": "X Axis",
"del_txtYAxis": "Y Axis",
"del_txtYears": "Years"
},
"textAnonymous": "مجهول",
"textBuyNow": "زيارة الموقع",
Expand Down
61 changes: 60 additions & 1 deletion apps/spreadsheeteditor/mobile/locale/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,66 @@
"Values": "Values",
"X Axis": "X Axis",
"Y Axis": "Y Axis",
"Years": "Years"
"Years": "Years",
"del_txtAccent": "Accent",
"del_txtAll": "(All)",
"del_txtArt": "Your text here",
"del_txtBlank": "(blank)",
"del_txtByField": "%1 of %2",
"del_txtClearFilter": "Clear Filter (Alt+C)",
"del_txtColLbls": "Column Labels",
"del_txtColumn": "Column",
"del_txtConfidential": "Confidential",
"del_txtDate": "Date",
"del_txtDays": "Days",
"del_txtDiagramTitle": "Chart Title",
"del_txtFile": "File",
"del_txtGrandTotal": "Grand Total",
"del_txtGroup": "Group",
"del_txtHours": "Hours",
"del_txtMinutes": "Minutes",
"del_txtMonths": "Months",
"del_txtMultiSelect": "Multi-Select (Alt+S)",
"del_txtOr": "%1 or %2",
"del_txtPage": "Page",
"del_txtPageOf": "Page %1 of %2",
"del_txtPages": "Pages",
"del_txtPreparedBy": "Prepared by",
"del_txtPrintArea": "Print_Area",
"del_txtQuarter": "Qtr",
"del_txtQuarters": "Quarters",
"del_txtRow": "Row",
"del_txtRowLbls": "Row Labels",
"del_txtSeconds": "Seconds",
"del_txtSeries": "Series",
"del_txtStyle_Bad": "Bad",
"del_txtStyle_Calculation": "Calculation",
"del_txtStyle_Check_Cell": "Check Cell",
"del_txtStyle_Comma": "Comma",
"del_txtStyle_Currency": "Currency",
"del_txtStyle_Explanatory_Text": "Explanatory Text",
"del_txtStyle_Good": "Good",
"del_txtStyle_Heading_1": "Heading 1",
"del_txtStyle_Heading_2": "Heading 2",
"del_txtStyle_Heading_3": "Heading 3",
"del_txtStyle_Heading_4": "Heading 4",
"del_txtStyle_Input": "Input",
"del_txtStyle_Linked_Cell": "Linked Cell",
"del_txtStyle_Neutral": "Neutral",
"del_txtStyle_Normal": "Normal",
"del_txtStyle_Note": "Note",
"del_txtStyle_Output": "Output",
"del_txtStyle_Percent": "Percent",
"del_txtStyle_Title": "Title",
"del_txtStyle_Total": "Total",
"del_txtStyle_Warning_Text": "Warning Text",
"del_txtTab": "Tab",
"del_txtTable": "Table",
"del_txtTime": "Time",
"del_txtValues": "Values",
"del_txtXAxis": "X Axis",
"del_txtYAxis": "Y Axis",
"del_txtYears": "Years"
},
"textAnonymous": "Anonim",
"textBuyNow": "Veb sayta daxil olun",
Expand Down
61 changes: 60 additions & 1 deletion apps/spreadsheeteditor/mobile/locale/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,66 @@
"Values": "Values",
"X Axis": "X Axis",
"Y Axis": "Y Axis",
"Years": "Years"
"Years": "Years",
"del_txtAccent": "Accent",
"del_txtAll": "(All)",
"del_txtArt": "Your text here",
"del_txtBlank": "(blank)",
"del_txtByField": "%1 of %2",
"del_txtClearFilter": "Clear Filter (Alt+C)",
"del_txtColLbls": "Column Labels",
"del_txtColumn": "Column",
"del_txtConfidential": "Confidential",
"del_txtDate": "Date",
"del_txtDays": "Days",
"del_txtDiagramTitle": "Chart Title",
"del_txtFile": "File",
"del_txtGrandTotal": "Grand Total",
"del_txtGroup": "Group",
"del_txtHours": "Hours",
"del_txtMinutes": "Minutes",
"del_txtMonths": "Months",
"del_txtMultiSelect": "Multi-Select (Alt+S)",
"del_txtOr": "%1 or %2",
"del_txtPage": "Page",
"del_txtPageOf": "Page %1 of %2",
"del_txtPages": "Pages",
"del_txtPreparedBy": "Prepared by",
"del_txtPrintArea": "Print_Area",
"del_txtQuarter": "Qtr",
"del_txtQuarters": "Quarters",
"del_txtRow": "Row",
"del_txtRowLbls": "Row Labels",
"del_txtSeconds": "Seconds",
"del_txtSeries": "Series",
"del_txtStyle_Bad": "Bad",
"del_txtStyle_Calculation": "Calculation",
"del_txtStyle_Check_Cell": "Check Cell",
"del_txtStyle_Comma": "Comma",
"del_txtStyle_Currency": "Currency",
"del_txtStyle_Explanatory_Text": "Explanatory Text",
"del_txtStyle_Good": "Good",
"del_txtStyle_Heading_1": "Heading 1",
"del_txtStyle_Heading_2": "Heading 2",
"del_txtStyle_Heading_3": "Heading 3",
"del_txtStyle_Heading_4": "Heading 4",
"del_txtStyle_Input": "Input",
"del_txtStyle_Linked_Cell": "Linked Cell",
"del_txtStyle_Neutral": "Neutral",
"del_txtStyle_Normal": "Normal",
"del_txtStyle_Note": "Note",
"del_txtStyle_Output": "Output",
"del_txtStyle_Percent": "Percent",
"del_txtStyle_Title": "Title",
"del_txtStyle_Total": "Total",
"del_txtStyle_Warning_Text": "Warning Text",
"del_txtTab": "Tab",
"del_txtTable": "Table",
"del_txtTime": "Time",
"del_txtValues": "Values",
"del_txtXAxis": "X Axis",
"del_txtYAxis": "Y Axis",
"del_txtYears": "Years"
},
"textAnonymous": "Ананімны карыстальнік",
"textClose": "Закрыць",
Expand Down
61 changes: 60 additions & 1 deletion apps/spreadsheeteditor/mobile/locale/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,66 @@
"Values": "Values",
"X Axis": "X Axis",
"Y Axis": "Y Axis",
"Years": "Years"
"Years": "Years",
"del_txtAccent": "Accent",
"del_txtAll": "(All)",
"del_txtArt": "Your text here",
"del_txtBlank": "(blank)",
"del_txtByField": "%1 of %2",
"del_txtClearFilter": "Clear Filter (Alt+C)",
"del_txtColLbls": "Column Labels",
"del_txtColumn": "Column",
"del_txtConfidential": "Confidential",
"del_txtDate": "Date",
"del_txtDays": "Days",
"del_txtDiagramTitle": "Chart Title",
"del_txtFile": "File",
"del_txtGrandTotal": "Grand Total",
"del_txtGroup": "Group",
"del_txtHours": "Hours",
"del_txtMinutes": "Minutes",
"del_txtMonths": "Months",
"del_txtMultiSelect": "Multi-Select (Alt+S)",
"del_txtOr": "%1 or %2",
"del_txtPage": "Page",
"del_txtPageOf": "Page %1 of %2",
"del_txtPages": "Pages",
"del_txtPreparedBy": "Prepared by",
"del_txtPrintArea": "Print_Area",
"del_txtQuarter": "Qtr",
"del_txtQuarters": "Quarters",
"del_txtRow": "Row",
"del_txtRowLbls": "Row Labels",
"del_txtSeconds": "Seconds",
"del_txtSeries": "Series",
"del_txtStyle_Bad": "Bad",
"del_txtStyle_Calculation": "Calculation",
"del_txtStyle_Check_Cell": "Check Cell",
"del_txtStyle_Comma": "Comma",
"del_txtStyle_Currency": "Currency",
"del_txtStyle_Explanatory_Text": "Explanatory Text",
"del_txtStyle_Good": "Good",
"del_txtStyle_Heading_1": "Heading 1",
"del_txtStyle_Heading_2": "Heading 2",
"del_txtStyle_Heading_3": "Heading 3",
"del_txtStyle_Heading_4": "Heading 4",
"del_txtStyle_Input": "Input",
"del_txtStyle_Linked_Cell": "Linked Cell",
"del_txtStyle_Neutral": "Neutral",
"del_txtStyle_Normal": "Normal",
"del_txtStyle_Note": "Note",
"del_txtStyle_Output": "Output",
"del_txtStyle_Percent": "Percent",
"del_txtStyle_Title": "Title",
"del_txtStyle_Total": "Total",
"del_txtStyle_Warning_Text": "Warning Text",
"del_txtTab": "Tab",
"del_txtTable": "Table",
"del_txtTime": "Time",
"del_txtValues": "Values",
"del_txtXAxis": "X Axis",
"del_txtYAxis": "Y Axis",
"del_txtYears": "Years"
},
"textAnonymous": "Anonymous",
"textBuyNow": "Visit website",
Expand Down
61 changes: 60 additions & 1 deletion apps/spreadsheeteditor/mobile/locale/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,66 @@
"Values": "Values",
"X Axis": "X Axis",
"Y Axis": "Y Axis",
"Years": "Years"
"Years": "Years",
"del_txtAccent": "Accent",
"del_txtAll": "(All)",
"del_txtArt": "Your text here",
"del_txtBlank": "(blank)",
"del_txtByField": "%1 of %2",
"del_txtClearFilter": "Clear Filter (Alt+C)",
"del_txtColLbls": "Column Labels",
"del_txtColumn": "Column",
"del_txtConfidential": "Confidential",
"del_txtDate": "Date",
"del_txtDays": "Days",
"del_txtDiagramTitle": "Chart Title",
"del_txtFile": "File",
"del_txtGrandTotal": "Grand Total",
"del_txtGroup": "Group",
"del_txtHours": "Hours",
"del_txtMinutes": "Minutes",
"del_txtMonths": "Months",
"del_txtMultiSelect": "Multi-Select (Alt+S)",
"del_txtOr": "%1 or %2",
"del_txtPage": "Page",
"del_txtPageOf": "Page %1 of %2",
"del_txtPages": "Pages",
"del_txtPreparedBy": "Prepared by",
"del_txtPrintArea": "Print_Area",
"del_txtQuarter": "Qtr",
"del_txtQuarters": "Quarters",
"del_txtRow": "Row",
"del_txtRowLbls": "Row Labels",
"del_txtSeconds": "Seconds",
"del_txtSeries": "Series",
"del_txtStyle_Bad": "Bad",
"del_txtStyle_Calculation": "Calculation",
"del_txtStyle_Check_Cell": "Check Cell",
"del_txtStyle_Comma": "Comma",
"del_txtStyle_Currency": "Currency",
"del_txtStyle_Explanatory_Text": "Explanatory Text",
"del_txtStyle_Good": "Good",
"del_txtStyle_Heading_1": "Heading 1",
"del_txtStyle_Heading_2": "Heading 2",
"del_txtStyle_Heading_3": "Heading 3",
"del_txtStyle_Heading_4": "Heading 4",
"del_txtStyle_Input": "Input",
"del_txtStyle_Linked_Cell": "Linked Cell",
"del_txtStyle_Neutral": "Neutral",
"del_txtStyle_Normal": "Normal",
"del_txtStyle_Note": "Note",
"del_txtStyle_Output": "Output",
"del_txtStyle_Percent": "Percent",
"del_txtStyle_Title": "Title",
"del_txtStyle_Total": "Total",
"del_txtStyle_Warning_Text": "Warning Text",
"del_txtTab": "Tab",
"del_txtTable": "Table",
"del_txtTime": "Time",
"del_txtValues": "Values",
"del_txtXAxis": "X Axis",
"del_txtYAxis": "Y Axis",
"del_txtYears": "Years"
},
"textAnonymous": "Anònim",
"textBuyNow": "Visitar el lloc web",
Expand Down
Loading

0 comments on commit f2b679e

Please sign in to comment.