Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE SSE] Make two line captions for buttons in toolbar

Browse source
This commit is contained in:
JuliaSvinareva 2021-12-28 18:18:18 +03:00
parent d5960dd972
commit 4084696900
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/Button.js
View file

@ -213,6 +213,7 @@ define([
'<span class="caption"><%= caption %>' + '<span class="caption"><%= caption %>' +
'<i class="caret"></i>' + '<i class="caret"></i>' +
'</span>' + '</span>' +
'<i class="caret compact-caret"></i>' +
'</div>' + '</div>' +
'</button>' + '</button>' +
'</div>'; '</div>';
@ -229,6 +230,7 @@ define([
'<span class="caption"><%= caption %>' + '<span class="caption"><%= caption %>' +
'<i class="caret"></i>' + '<i class="caret"></i>' +
'</span>' + '</span>' +
'<i class="caret compact-caret"></i>' +
'</span>' + '</span>' +
'</button>' + '</button>' +
'</div>'; '</div>';

6
apps/common/main/resources/less/buttons.less
View file

@ -70,6 +70,9 @@
transition: transform 0.2s ease; transition: transform 0.2s ease;
transform: rotate(-135deg) translate(1px,1px); transform: rotate(-135deg) translate(1px,1px);
&.compact-caret {
display: none;
}
} }
//&:active, //&:active,
@ -229,7 +232,7 @@
.inner-box-caption { .inner-box-caption {
line-height: 18px; line-height: 18px;
padding: 0 2px; padding: 0 3px;
display: flex; display: flex;
//align-items: center; //align-items: center;
align-items: start; align-items: start;
@ -238,6 +241,7 @@
max-width: 85px; max-width: 85px;
max-height: 22px; max-height: 22px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden;
white-space: pre-line; white-space: pre-line;
line-height: 10px; line-height: 10px;

9
apps/common/main/resources/less/toolbar.less
View file

@ -192,6 +192,11 @@
.inner-box-caption { .inner-box-caption {
justify-content: center; justify-content: center;
align-items: center;
}
.compact-caret {
display: block;
} }
} }
} }
@ -237,7 +242,7 @@
font-size: 0; font-size: 0;
&:not(:first-child) { &:not(:first-child) {
margin-top: 6px; margin-top: 8px;
} }
&.font-normal { &.font-normal {
@ -253,7 +258,7 @@
} }
&.long { &.long {
height: 46px; height: 48px;
} }
&.short { &.short {