Merge branch 'release/v5.0.0' into develop

apps/common/main/lib/component/Button.js

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

apps/common/main/resources/less/buttons.less

@@ -144,13 +144,23 @@
         line-height: 20px;
     }
 
+    .btn-fixflex-hcenter {
+        flex-grow: 1;
+    }
+
+    .btn-fixflex-vcenter {
+        .caret {
+            vertical-align: inherit;
+        }
+    }
+
     .inner-box-caption {
         margin: 0;
         height: 18px;
     }
 
     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;
     }
 
+    &.dropdown-toggle:first-child .inner-box-caret {
+      padding: 0 2px 0 0;
+    }
+
     &:hover:not(.disabled),
     .over:not(.disabled) {
         background-color: @secondary !important;

apps/common/main/resources/less/combo-dataview.less

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

apps/presentationeditor/main/app.reporter.js

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