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

Merge branch 'release/v5.0.0' into develop

Browse source
This commit is contained in:
Maxim Kadushkin 2017-08-15 14:58:24 +03:00
parent 0bb1d90bb3 2db70932f2
commit 2071162fb8
4 changed files with 27 additions and 5 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>';

16
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.
} }
} }
@ -557,6 +567,10 @@
background-repeat: no-repeat; background-repeat: no-repeat;
} }
&.dropdown-toggle:first-child .inner-box-caret {
padding: 0 2px 0 0;
}
&:hover:not(.disabled), &:hover:not(.disabled),
.over:not(.disabled) { .over:not(.disabled) {
background-color: @secondary !important; background-color: @secondary !important;

4
apps/common/main/resources/less/combo-dataview.less
View file

@ -28,6 +28,10 @@
background-color: @input-bg; background-color: @input-bg;
&.dropdown-toggle { &.dropdown-toggle {
.inner-box-caret {
padding: 0 2px 0 0;
}
.caret { .caret {
// width: 7px; // width: 7px;
// height: 7px; // height: 7px;

4
apps/presentationeditor/main/app.reporter.js
View file

@ -45,8 +45,8 @@ require.config({
// scripts that do not call define() to register a module // scripts that do not call define() to register a module
baseUrl: '../../', baseUrl: '../../',
paths: { paths: {
jquery : '../vendor/jquery/jquery', jquery : '../vendor/jquery/jquery.min',
underscore : '../vendor/underscore/underscore', underscore : '../vendor/underscore/underscore-min',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', sockjs : '../vendor/sockjs/sockjs.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',