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

Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-07-19 17:37:12 +03:00 committed by GitHub
commit d600ca958f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 621 additions and 614 deletions

View file

@ -383,9 +383,12 @@
}
}
.color-palettes {
.page {
.color-palettes {
.list {
.palette {
padding: 8px 0px;
.row {
a {
flex-grow: 1;
position: relative;
@ -393,6 +396,7 @@
min-height: 26px;
margin: 1px 1px 0 0;
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
border-radius: 0;
&.active:after {
content: ' ';
position: absolute;
@ -409,6 +413,8 @@
}
}
}
}
}
.row {
padding: 0;
}
@ -426,6 +432,7 @@
background-color: @white;
}
}
}
}
#color-picker {

View file

@ -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": "Порядок",