Merge pull request #994 from ONLYOFFICE/feature/bug-fixes
Feature/bug fixes
This commit is contained in:
commit
d600ca958f
|
@ -383,47 +383,54 @@
|
|||
}
|
||||
}
|
||||
|
||||
.color-palettes {
|
||||
.palette {
|
||||
padding: 8px 0px;
|
||||
a {
|
||||
flex-grow: 1;
|
||||
position: relative;
|
||||
min-width: 10px;
|
||||
min-height: 26px;
|
||||
margin: 1px 1px 0 0;
|
||||
box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
|
||||
&.active:after {
|
||||
content: ' ';
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
|
||||
z-index: 1;
|
||||
border-radius: 1px;
|
||||
}
|
||||
&.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>");
|
||||
.page {
|
||||
.color-palettes {
|
||||
.list {
|
||||
.palette {
|
||||
padding: 8px 0px;
|
||||
.row {
|
||||
a {
|
||||
flex-grow: 1;
|
||||
position: relative;
|
||||
min-width: 10px;
|
||||
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;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor;
|
||||
z-index: 1;
|
||||
border-radius: 1px;
|
||||
}
|
||||
&.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 {
|
||||
padding: 0;
|
||||
}
|
||||
.list .item-inner {
|
||||
display: block;
|
||||
}
|
||||
.standart-colors, .dynamic-colors {
|
||||
.palette {
|
||||
display: flex;
|
||||
.row {
|
||||
padding: 0;
|
||||
}
|
||||
.list .item-inner {
|
||||
display: block;
|
||||
}
|
||||
.standart-colors, .dynamic-colors {
|
||||
.palette {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.dynamic-colors {
|
||||
.empty-color {
|
||||
background-color: @white;
|
||||
.dynamic-colors {
|
||||
.empty-color {
|
||||
background-color: @white;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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": "Порядок",
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue