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

fix bug 35586, 35591, 35593

Browse source
This commit is contained in:
Maxim Kadushkin 2017-08-15 14:26:40 +03:00
parent 789530e173
commit 88588a8fba
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,11 +155,15 @@ define([
var templateHugeSplitCaption = var templateHugeSplitCaption =
'<div class="btn-group x-huge split icon-top" id="<%= id %>" style="<%= style %>">' + '<div class="btn-group x-huge split icon-top" id="<%= id %>" style="<%= style %>">' +
'<button type="button" class="btn <%= cls %> inner-box-icon">' + '<button type="button" class="btn <%= cls %> inner-box-icon">' +
templateBtnIcon + '<span class="btn-fixflex-hcenter">' +
templateBtnIcon +
'</span>' +
'</button>' + '</button>' +
'<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown">' + '<button type="button" class="btn <%= cls %> inner-box-caption dropdown-toggle" data-toggle="dropdown">' +
'<span class="caption"><%= caption %></span>' + '<span class="caption"><%= caption %></span>' +
'<i class="caret img-commonctrl"></i>' + '<span class="btn-fixflex-vcenter">' +
'<i class="caret img-commonctrl"></i>' +
'</span>' +
'</button>' + '</button>' +
'</div>'; '</div>';

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

@ -144,13 +144,23 @@
line-height: 20px; line-height: 20px;
} }
.btn-fixflex-hcenter {
flex-grow: 1;
}
.btn-fixflex-vcenter {
.caret {
vertical-align: inherit;
}
}
.inner-box-caption { .inner-box-caption {
margin: 0; margin: 0;
height: 18px; height: 18px;
} }
div.inner-box-icon { div.inner-box-icon {
height: 28px; // TODO: clear. FF bug 984869. fixed. isn't released. height: 28px; // TODO: clear. Firefox bug 984869. fixed. isn't released.
} }
} }