Merge pull request #994 from ONLYOFFICE/feature/bug-fixes

Feature/bug fixes

apps/common/mobile/resources/less/common.less

@@ -383,47 +383,54 @@
     }
 }
 
-.color-palettes {
+.page {
-    .palette {
+    .color-palettes {
-        padding: 8px 0px;
+        .list {
-        a {
+            .palette {
-            flex-grow: 1;
+                padding: 8px 0px;
-            position: relative;
+                .row {
-            min-width: 10px;
+                    a {
-            min-height: 26px;
+                        flex-grow: 1;
-            margin: 1px 1px 0 0;
+                        position: relative;
-            box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
+                        min-width: 10px;
-            &.active:after {
+                        min-height: 26px;
-                content: ' ';
+                        margin: 1px 1px 0 0;
-                position: absolute;
+                        box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
-                width: 100%;
+                        border-radius: 0;
-                height: 100%;
+                        &.active:after {
-                box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
+                            content: ' ';
-                z-index: 1;
+                            position: absolute;
-                border-radius: 1px;
+                            width: 100%;
-            }
+                            height: 100%;
-            &.transparent {
+                            box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
-                background-repeat: no-repeat;
+                            z-index: 1;
-                background-size: 100% 100%;
+                            border-radius: 1px;
-                .encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
+                        }
+                        &.transparent {
+                            background-repeat: no-repeat;
+                            background-size: 100% 100%;
+                            .encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 22 22' xml:space='preserve'><line stroke='#ff0000' stroke-linecap='undefined' stroke-linejoin='undefined' id='svg_1' y2='0' x2='22' y1='22' x1='0' stroke-width='2' fill='none'/></svg>");
+                        }
+                    }
+                }
             }
         }
-    }
+        .row {
-    .row {
+            padding: 0;
-        padding: 0;
+        }
-    }
+        .list .item-inner {
-    .list .item-inner {
+            display: block;
-        display: block;
+        }
-    }
+        .standart-colors, .dynamic-colors {
-    .standart-colors, .dynamic-colors {
+            .palette {
-        .palette {
+                display: flex;
-            display: flex;
+            }
         }
-    }
 
-    .dynamic-colors {
+        .dynamic-colors {
-        .empty-color {
+            .empty-color {
-            background-color: @white;
+                background-color: @white;
+            }
         }
     }
 }

apps/documenteditor/mobile/locale/backup/ru.json

@@ -106,7 +106,7 @@
   "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку",
   "DE.Controllers.DocumentHolder.sheetCancel": "Отмена",
   "DE.Controllers.DocumentHolder.textCancel": "Отмена",
-  "DE.Controllers.DocumentHolder.textColumns": "Колонки",
+  "DE.Controllers.DocumentHolder.textColumns": "Столбцы",
   "DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Операции копирования, вырезания и вставки",
   "DE.Controllers.DocumentHolder.textDoNotShowAgain": "Больше не показывать",
   "DE.Controllers.DocumentHolder.textGuest": "Гость",
@@ -394,7 +394,7 @@
   "DE.Views.EditShape.textFromText": "Расстояние до текста",
   "DE.Views.EditShape.textInFront": "Перед текстом",
   "DE.Views.EditShape.textInline": "В тексте",
-  "DE.Views.EditShape.textOpacity": "Прозрачность",
+  "DE.Views.EditShape.textOpacity": "Непрозрачность",
   "DE.Views.EditShape.textOverlap": "Разрешить перекрытие",
   "DE.Views.EditShape.textRemoveShape": "Удалить фигуру",
   "DE.Views.EditShape.textReorder": "Порядок",