From 163e0e26dcbcb963ace079248ff661932cf763c1 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 17 Oct 2019 13:09:58 +0300 Subject: [PATCH] [mobile] Custom color (add border, add translations) --- apps/common/mobile/lib/component/HsbColorPicker.js | 3 +-- .../mobile/resources/less/ios/_color-palette.less | 1 + .../resources/less/material/_color-palette.less | 1 + apps/documenteditor/mobile/locale/en.json | 11 +++++++++++ apps/documenteditor/mobile/resources/css/app-ios.css | 1 + .../mobile/resources/css/app-material.css | 1 + apps/presentationeditor/mobile/locale/en.json | 11 +++++++++++ .../mobile/resources/css/app-ios.css | 1 + .../mobile/resources/css/app-material.css | 1 + apps/spreadsheeteditor/mobile/locale/en.json | 9 +++++++++ .../mobile/resources/css/app-ios.css | 1 + .../mobile/resources/css/app-material.css | 1 + 12 files changed, 40 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/lib/component/HsbColorPicker.js b/apps/common/mobile/lib/component/HsbColorPicker.js index 1f201187a..22d461934 100644 --- a/apps/common/mobile/lib/component/HsbColorPicker.js +++ b/apps/common/mobile/lib/component/HsbColorPicker.js @@ -321,8 +321,7 @@ define([ } this.trigger('addcustomcolor', this, color); } - }, + } - textCustomColors: 'Custom Colors' }, Common.UI.HsbColorPicker || {})); }); \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_color-palette.less b/apps/common/mobile/resources/less/ios/_color-palette.less index 1533ff2d4..f243b1ef6 100644 --- a/apps/common/mobile/resources/less/ios/_color-palette.less +++ b/apps/common/mobile/resources/less/ios/_color-palette.less @@ -79,6 +79,7 @@ height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #c4c4c4; } .new-color-hsb-preview { width: 100%; diff --git a/apps/common/mobile/resources/less/material/_color-palette.less b/apps/common/mobile/resources/less/material/_color-palette.less index 3e7b7d1b4..511765221 100644 --- a/apps/common/mobile/resources/less/material/_color-palette.less +++ b/apps/common/mobile/resources/less/material/_color-palette.less @@ -84,6 +84,7 @@ height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #ededed; } .new-color-hsb-preview { width: 100%; diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 96ecafa44..97469cecc 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -60,6 +60,7 @@ "Common.Controllers.Collaboration.textWidow": "Widow control", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.Collaboration.textAcceptAllChanges": "Accept All Changes", @@ -318,6 +319,8 @@ "DE.Views.EditChart.textTopBottom": "Top and Bottom", "DE.Views.EditChart.textType": "Type", "DE.Views.EditChart.textWrap": "Wrap", + "DE.Views.EditChart.textAddCustomColor": "Add Custom Color", + "DE.Views.EditChart.textCustomColor": "Custom Color", "DE.Views.EditHeader.textDiffFirst": "Different first page", "DE.Views.EditHeader.textDiffOdd": "Different odd and even pages", "DE.Views.EditHeader.textFrom": "Start at", @@ -371,6 +374,8 @@ "DE.Views.EditParagraph.textPageBreak": "Page Break Before", "DE.Views.EditParagraph.textPrgStyles": "Paragraph styles", "DE.Views.EditParagraph.textSpaceBetween": "Space Between Paragraphs", + "DE.Views.EditParagraph.textAddCustomColor": "Add Custom Color", + "DE.Views.EditParagraph.textCustomColor": "Custom Color", "DE.Views.EditShape.textAlign": "Align", "DE.Views.EditShape.textBack": "Back", "DE.Views.EditShape.textBackward": "Move Backward", @@ -398,6 +403,8 @@ "DE.Views.EditShape.textTopAndBottom": "Top and Bottom", "DE.Views.EditShape.textWithText": "Move with Text", "DE.Views.EditShape.textWrap": "Wrap", + "DE.Views.EditShape.textAddCustomColor": "Add Custom Color", + "DE.Views.EditShape.textCustomColor": "Custom Color", "DE.Views.EditTable.textAlign": "Align", "DE.Views.EditTable.textBack": "Back", "DE.Views.EditTable.textBandedColumn": "Banded Column", @@ -423,6 +430,8 @@ "DE.Views.EditTable.textTotalRow": "Total Row", "DE.Views.EditTable.textWithText": "Move with Text", "DE.Views.EditTable.textWrap": "Wrap", + "DE.Views.EditTable.textAddCustomColor": "Add Custom Color", + "DE.Views.EditTable.textCustomColor": "Custom Color", "DE.Views.EditText.textAdditional": "Additional", "DE.Views.EditText.textAdditionalFormat": "Additional Formatting", "DE.Views.EditText.textAllCaps": "All Caps", @@ -448,6 +457,8 @@ "DE.Views.EditText.textSmallCaps": "Small Caps", "DE.Views.EditText.textStrikethrough": "Strikethrough", "DE.Views.EditText.textSubscript": "Subscript", + "DE.Views.EditText.textAddCustomColor": "Add Custom Color", + "DE.Views.EditText.textCustomColor": "Custom Color", "DE.Views.Search.textCase": "Case sensitive", "DE.Views.Search.textDone": "Done", "DE.Views.Search.textFind": "Find", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index d094f347b..974bae797 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6260,6 +6260,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #c4c4c4; } .custom-colors .new-color-hsb-preview { width: 100%; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 2f040a533..450682feb 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5854,6 +5854,7 @@ html.phone .document-menu .list-block .item-link { height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #ededed; } .custom-colors .new-color-hsb-preview { width: 100%; diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index d55aa3c0a..42ca143eb 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -2,6 +2,7 @@ "Common.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.Collaboration.textBack": "Back", @@ -275,6 +276,8 @@ "PE.Views.EditChart.textType": "Type", "PE.Views.EditChart.txtDistribHor": "Distribute Horizontally", "PE.Views.EditChart.txtDistribVert": "Distribute Vertically", + "PE.Views.EditChart.textAddCustomColor": "Add Custom Color", + "PE.Views.EditChart.textCustomColor": "Custom Color", "PE.Views.EditImage.textAddress": "Address", "PE.Views.EditImage.textAlign": "Align", "PE.Views.EditImage.textAlignBottom": "Align Bottom", @@ -338,6 +341,8 @@ "PE.Views.EditShape.textToForeground": "Bring to Foreground", "PE.Views.EditShape.txtDistribHor": "Distribute Horizontally", "PE.Views.EditShape.txtDistribVert": "Distribute Vertically", + "PE.Views.EditShape.textAddCustomColor": "Add Custom Color", + "PE.Views.EditShape.textCustomColor": "Custom Color", "PE.Views.EditSlide.textApplyAll": "Apply to All Slides", "PE.Views.EditSlide.textBack": "Back", "PE.Views.EditSlide.textBlack": "Through Black", @@ -383,6 +388,8 @@ "PE.Views.EditSlide.textZoomIn": "Zoom In", "PE.Views.EditSlide.textZoomOut": "Zoom Out", "PE.Views.EditSlide.textZoomRotate": "Zoom and Rotate", + "PE.Views.EditSlide.textAddCustomColor": "Add Custom Color", + "PE.Views.EditSlide.textCustomColor": "Custom Color", "PE.Views.EditTable.textAlign": "Align", "PE.Views.EditTable.textAlignBottom": "Align Bottom", "PE.Views.EditTable.textAlignCenter": "Align Center", @@ -414,6 +421,8 @@ "PE.Views.EditTable.textTotalRow": "Total Row", "PE.Views.EditTable.txtDistribHor": "Distribute Horizontally", "PE.Views.EditTable.txtDistribVert": "Distribute Vertically", + "PE.Views.EditTable.textAddCustomColor": "Add Custom Color", + "PE.Views.EditTable.textCustomColor": "Custom Color", "PE.Views.EditText.textAdditional": "Additional", "PE.Views.EditText.textAdditionalFormat": "Additional Formatting", "PE.Views.EditText.textAfter": "After", @@ -440,6 +449,8 @@ "PE.Views.EditText.textSmallCaps": "Small Caps", "PE.Views.EditText.textStrikethrough": "Strikethrough", "PE.Views.EditText.textSubscript": "Subscript", + "PE.Views.EditText.textAddCustomColor": "Add Custom Color", + "PE.Views.EditText.textCustomColor": "Custom Color", "PE.Views.Search.textCase": "Case sensitive", "PE.Views.Search.textDone": "Done", "PE.Views.Search.textFind": "Find", diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index d2e85d0d2..ad0ef6905 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6260,6 +6260,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #c4c4c4; } .custom-colors .new-color-hsb-preview { width: 100%; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 8293d97da..645479deb 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -5854,6 +5854,7 @@ html.phone .document-menu .list-block .item-link { height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #ededed; } .custom-colors .new-color-hsb-preview { width: 100%; diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 138513d20..a2dfeeeb3 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -2,6 +2,7 @@ "Common.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.Collaboration.textBack": "Back", @@ -395,6 +396,8 @@ "SSE.Views.EditCell.textTopBorder": "Top Border", "SSE.Views.EditCell.textWrapText": "Wrap Text", "SSE.Views.EditCell.textYen": "Yen", + "SSE.Views.EditCell.textAddCustomColor": "Add Custom Color", + "SSE.Views.EditCell.textCustomColor": "Custom Color", "SSE.Views.EditChart.textAuto": "Auto", "SSE.Views.EditChart.textAxisCrosses": "Axis Crosses", "SSE.Views.EditChart.textAxisOptions": "Axis Options", @@ -447,6 +450,8 @@ "SSE.Views.EditChart.textValReverseOrder": "Values in Reverse Order", "SSE.Views.EditChart.textVerAxis": "Vertical Axis", "SSE.Views.EditChart.textVertical": "Vertical", + "SSE.Views.EditChart.textAddCustomColor": "Add Custom Color", + "SSE.Views.EditChart.textCustomColor": "Custom Color", "SSE.Views.EditHyperlink.textBack": "Back", "SSE.Views.EditHyperlink.textDisplay": "Display", "SSE.Views.EditHyperlink.textEditLink": "Edit Link", @@ -488,6 +493,8 @@ "SSE.Views.EditShape.textStyle": "Style", "SSE.Views.EditShape.textToBackground": "Send to Background", "SSE.Views.EditShape.textToForeground": "Bring to Foreground", + "SSE.Views.EditShape.textAddCustomColor": "Add Custom Color", + "SSE.Views.EditShape.textCustomColor": "Custom Color", "SSE.Views.EditText.textBack": "Back", "SSE.Views.EditText.textCharacterBold": "B", "SSE.Views.EditText.textCharacterItalic": "I", @@ -496,6 +503,8 @@ "SSE.Views.EditText.textFonts": "Fonts", "SSE.Views.EditText.textSize": "Size", "SSE.Views.EditText.textTextColor": "Text Color", + "SSE.Views.EditText.textAddCustomColor": "Add Custom Color", + "SSE.Views.EditText.textCustomColor": "Custom Color", "SSE.Views.FilterOptions.textClearFilter": "Clear Filter", "SSE.Views.FilterOptions.textDeleteFilter": "Delete Filter", "SSE.Views.FilterOptions.textFilter": "Filter Options", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index f6cdb073f..fd37673e5 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6260,6 +6260,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #c4c4c4; } .custom-colors .new-color-hsb-preview { width: 100%; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 954150958..61264eaf2 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -5864,6 +5864,7 @@ html.phone .document-menu .list-block .item-link { height: 72px; border-radius: 100px; overflow: hidden; + border: 1px solid #ededed; } .custom-colors .new-color-hsb-preview { width: 100%;