@eclipse-scout/core 22.0.0-beta.5 → 22.0.2

package/src/desktop/viewbutton/ViewMenuTab.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,11 +19,11 @@
     align-items: center;
     justify-content: center;
     background-color: transparent;
+    cursor: pointer;
 
     &:hover {
       background-color: @view-menu-tab-hover-background-color;
       color: inherit;
-      cursor: pointer;
     }
 
     &.disabled {
@@ -158,6 +158,7 @@
       & > .view-button {
         padding-left: @view-tab-margin;
         width: @view-tab-selected-width;
+        cursor: default;
       }
 
       .selected-button-invisible& > .view-menu {

package/src/filechooser/FileChooser.less

@@ -51,7 +51,7 @@
   text-align: center;
   word-wrap: break-word;
   #scout.font-text-large(@font-weight-bold);
-  color: @active-color;
+  color: @info-color;
 }
 
 .file-chooser-label {

package/src/form/Form.less

@@ -125,6 +125,7 @@
     #scout.overflow-ellipsis-nowrap();
     font-size: @font-size-large;
     color: @title-color;
+    margin-top: @text-margin-top;
   }
 
   & > .sub-title {

package/src/form/fields/LookupBox.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ export default class LookupBox extends ValueField {
     this.gridDataHints.weightY = 1.0;
     this.gridDataHints.h = 2;
     this.value = [];
+    this.clearable = ValueField.Clearable.NEVER;
 
     this.lookupCall = null;
     this._pendingLookup = null;

package/src/form/fields/breadcrumbbarfield/BreadcrumbBarField.less

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+.breadcrumb-bar-field > .field {
+  padding-top: @borderless-field-padding-y;
+  padding-bottom: @borderless-field-padding-y + 1px; // BreadCrumbItem uses 14px instead of 13px font size
+}

package/src/form/fields/groupbox/GroupBox.js

@@ -162,12 +162,12 @@ export default class GroupBox extends CompositeField {
       render: () => true,
       offset: 0,
       hAlign: HAlign.RIGHT,
-      $drawingArea: function($drawingArea, event) {
-        if (this.labelVisible) {
+      $drawingArea: ($drawingArea, event) => {
+        if (this.$header && this.$header.isVisible()) {
           return this.$header;
         }
         return this.$body;
-      }.bind(this)
+      }
     };
 
     keyStrokes
@@ -360,14 +360,11 @@ export default class GroupBox extends CompositeField {
     this.$container.toggleClass('has-scroll-shadow-bottom', hasScrollShadowBottom);
     if ((headerVisible || hasMenubarTop) && oldHasScrollShadowTop !== hasScrollShadowTop
       || hasMenubarBottom && oldHasScrollShadowBottom !== hasScrollShadowBottom) {
-      this.invalidateLayout();
+      this.invalidateLayoutTree(false);
     }
 
     // Enlarge header line if there is a shadow, but don't do it if there is a menubar on top
     fields.adjustStatusPositionForScrollShadow(this, () => hasScrollShadowTop && headerVisible && !hasMenubarTop);
-
-    // Prevent flickering of status icon
-    this.validateLayout();
   }
 
   setMainBox(mainBox) {
@@ -782,9 +779,16 @@ export default class GroupBox extends CompositeField {
   }
 
   _onControlClick(event) {
-    if (this.expandable) {
-      this.setExpanded(!this.expanded);
+    if (!this.expandable) {
+      return;
     }
+    const target = scout.widget(event.target);
+    if (this.menuBarPosition === GroupBox.MenuBarPosition.TITLE && this.menuBar.has(target)) {
+      // If the position of the menubar is set to title and a menu has been clicked, then the event must not be handled
+      return;
+    }
+
+    this.setExpanded(!this.expanded);
     $.suppressEvent(event); // otherwise, the event would be triggered twice sometimes (by group-box-control and group-box-title)
   }
 

package/src/form/fields/groupbox/GroupBox.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -119,6 +119,8 @@
     display: inline-block;
     vertical-align: middle;
     padding: @group-box-title-padding-top 0 @group-box-title-padding-bottom 0;
+    max-width: 100%;
+    margin-top: @text-margin-top;
 
     .group-box.has-sub-label > & {
       padding-bottom: @group-box-title-with-sub-label-padding-bottom;
@@ -135,6 +137,7 @@
       font-size: @sub-title-font-size;
       letter-spacing: @sub-title-letter-spacing;
       color: @sub-title-color;
+      #scout.overflow-ellipsis();
     }
   }
 

package/src/form/fields/htmlfield/HtmlField.less

@@ -19,7 +19,6 @@
 
   & > .field {
     margin-left: @mandatory-indicator-width;
-    overflow: hidden;
 
     &:focus {
       outline: none;

package/src/form/fields/listbox/ListBox.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {arrays, ListBoxLayout, LookupBox, scout, Table, ValueField} from '../../../index';
+import {arrays, ListBoxLayout, LookupBox, scout, Table} from '../../../index';
 
 export default class ListBox extends LookupBox {
 
@@ -17,7 +17,6 @@ export default class ListBox extends LookupBox {
 
     this.table = null;
     this.lookupStatus = null;
-    this.clearable = ValueField.Clearable.NEVER;
 
     this._addWidgetProperties(['table', 'filterBox']);
   }
@@ -32,6 +31,12 @@ export default class ListBox extends LookupBox {
     if (!this.table) {
       this.table = this._createDefaultListBoxTable();
     }
+
+    // align checkableColumn in table with checkboxes of tree fields
+    if (this.table.checkableColumn) { // may be null if a non-default list-box-table with checkable=false is used
+      this.table.checkableColumn.minWidth = 28;
+      this.table.checkableColumn.width = this.table.checkableColumn.minWidth; // do not use setWidth here
+    }
   }
 
   _render() {

package/src/form/fields/tabbox/TabAreaLayout.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,32 +30,37 @@ export default class TabAreaLayout extends AbstractLayout {
   }
 
   layout($container) {
-    let ellipsis = this.tabArea.ellipsis,
-      htmlContainer = HtmlComponent.get($container),
+    let htmlContainer = HtmlComponent.get($container),
       containerSize = htmlContainer.availableSize().subtract(htmlContainer.insets());
 
     // compute visible and overflown tabs
     this.preferredLayoutSize($container, {
       widthHint: containerSize.width
     });
+    this._layoutSelectionMarker();
+  }
 
-    if (this.overflowTabs.length > 0) {
-      ellipsis.setHidden(false);
-    }
-
-    this.visibleTabs.forEach(tabItem => {
-      tabItem.setOverflown(false);
-    });
-
-    this.overflowTabs.forEach(tabItem => {
-      tabItem.setOverflown(true);
-    });
+  _layoutSelectionMarker() {
+    let $selectionMarker = this.tabArea.$selectionMarker,
+      selectedTab = this.tabArea.selectedTab,
+      selectedItemBounds;
 
-    if (this.overflowTabs.length === 0) {
-      ellipsis.setHidden(true);
+    if (selectedTab) {
+      $selectionMarker.setVisible(true);
+      selectedItemBounds = graphics.bounds(selectedTab.$container);
+      $selectionMarker.cssLeft(selectedItemBounds.x);
+      $selectionMarker.cssWidth(selectedItemBounds.width);
+    } else {
+      $selectionMarker.setVisible(false);
     }
+  }
 
+  _updateEllipsis() {
+    let ellipsis = this.tabArea.ellipsis;
+    ellipsis.setHidden(this.overflowTabs.length < 1);
     ellipsis.setText(this.overflowTabs.length + '');
+    this.visibleTabs.forEach(tabItem => tabItem.setOverflown(false));
+    this.overflowTabs.forEach(tabItem => tabItem.setOverflown(true));
 
     ellipsis.setChildActions(this.overflowTabs.map(tab => {
       let menu = scout.create('Menu', {
@@ -73,73 +78,54 @@ export default class TabAreaLayout extends AbstractLayout {
       });
       return menu;
     }, this));
-
-    this._layoutSelectionMarker();
-  }
-
-  _layoutSelectionMarker() {
-    let $selectionMarker = this.tabArea.$selectionMarker,
-      selectedTab = this.tabArea.selectedTab,
-      selectedItemBounds;
-
-    if (selectedTab) {
-      $selectionMarker.setVisible(true);
-      selectedItemBounds = graphics.bounds(selectedTab.$container);
-      $selectionMarker.cssLeft(selectedItemBounds.x);
-      $selectionMarker.cssWidth(selectedItemBounds.width);
-    } else {
-      $selectionMarker.setVisible(false);
-    }
   }
 
   preferredLayoutSize($container, options) {
     let htmlComp = HtmlComponent.get($container),
       prefSize = new Dimension(0, 0),
-      prefWidth = Number.MAX_VALUE,
-      visibleTabItems = this.tabArea.visibleTabs(),
-      overflowableIndexes = visibleTabItems.map((tabItem, index) => {
-        if (tabItem.selected) {
-          return -1;
-        }
-        return index;
-      }).filter(index => index >= 0);
+      prefWidth = Number.MAX_VALUE;
+    this.visibleTabs = this.tabArea.visibleTabs();
+    let overflowableIndexes = this.visibleTabs.map((tabItem, index) => {
+      if (tabItem.selected) {
+        return -1;
+      }
+      return index;
+    }).filter(index => index >= 0);
 
     this.overflowTabs = [];
 
-    // consider avoid falsy 0 in tabboxes a 0 withHint will be used to calculate the minimum width
+    // consider avoid falsy 0 in tab-boxes a 0 withHint will be used to calculate the minimum width
     if (options.widthHint === 0 || options.widthHint) {
       prefWidth = options.widthHint - htmlComp.insets().horizontal();
     }
 
     // shortcut for minimum size.
     if (prefWidth <= 0) {
-      return this._minSize(visibleTabItems).add(htmlComp.insets());
+      return this._minSize(this.visibleTabs).add(htmlComp.insets());
     }
 
-    let overflowIndex = -1;
-    this._setFirstLastMarker(visibleTabItems);
-    prefSize = this._prefSize(visibleTabItems);
+    this._setFirstLastMarker(this.visibleTabs);
+    this._updateEllipsis();
+    prefSize = this._prefSize(this.visibleTabs);
+
     while (prefSize.width > prefWidth && overflowableIndexes.length > 0) {
-      overflowIndex = overflowableIndexes.splice(-1)[0];
-      this.overflowTabs.splice(0, 0, visibleTabItems[overflowIndex]);
-      visibleTabItems.splice(overflowIndex, 1);
-      this._setFirstLastMarker(visibleTabItems);
-      prefSize = this._prefSize(visibleTabItems);
+      let overflowIndex = overflowableIndexes.splice(-1)[0];
+      this.overflowTabs.splice(0, 0, this.visibleTabs[overflowIndex]);
+      this.visibleTabs.splice(overflowIndex, 1);
+      this._setFirstLastMarker(this.visibleTabs);
+      this._updateEllipsis(); // update ellipsis here already so that the prefSize on the next line is correct
+      prefSize = this._prefSize(this.visibleTabs);
     }
 
-    this.visibleTabs = visibleTabItems;
-
     // Use the total available space if spreading tabs evenly.
     if (this.tabArea.displayStyle === TabArea.DisplayStyle.SPREAD_EVEN) {
       return graphics.prefSize($container, options);
     }
-
     return graphics.exactPrefSize(prefSize.add(htmlComp.insets()), options);
   }
 
   _minSize(tabItems) {
-    let visibleTabItems = [],
-      prefSize;
+    let visibleTabItems = [];
     this.overflowTabs = tabItems.filter(tabItem => {
       if (tabItem.selected) {
         visibleTabItems.push(tabItem);
@@ -150,23 +136,21 @@ export default class TabAreaLayout extends AbstractLayout {
 
     this.visibleTabs = visibleTabItems;
     this._setFirstLastMarker(visibleTabItems);
-    prefSize = this._prefSize(visibleTabItems);
-
-    return prefSize;
+    return this._prefSize(visibleTabItems);
   }
 
   _prefSize(tabItems, considerEllipsis) {
-    let prefSize = tabItems.map(tabItem => this._tabItemSize(tabItem.htmlComp)
-      ).reduce((prefSize, itemSize) => {
+    let prefSize = tabItems
+      .map(tabItem => this._tabItemSize(tabItem))
+      .reduce((prefSize, itemSize) => {
         prefSize.height = Math.max(prefSize.height, itemSize.height);
         prefSize.width += itemSize.width;
         return prefSize;
-      }, new Dimension(0, 0)),
-      ellipsisSize = new Dimension(0, 0);
+      }, new Dimension(0, 0));
 
     considerEllipsis = scout.nvl(considerEllipsis, this.overflowTabs.length > 0);
     if (considerEllipsis) {
-      ellipsisSize = this._tabItemSize(this.tabArea.ellipsis.htmlComp);
+      let ellipsisSize = this._tabItemSize(this.tabArea.ellipsis);
       prefSize.height = Math.max(prefSize.height, ellipsisSize.height);
       prefSize.width += ellipsisSize.width;
     }
@@ -193,8 +177,8 @@ export default class TabAreaLayout extends AbstractLayout {
     }
   }
 
-  _tabItemSize(htmlComp) {
-    let prefSize,
+  _tabItemSize(item) {
+    let htmlComp = item.htmlComp, prefSize,
       classList = htmlComp.$comp.attr('class');
 
     // temporarily revert display style to default. otherwise the pref size of the tab item will be the size of the container.
@@ -208,6 +192,19 @@ export default class TabAreaLayout extends AbstractLayout {
     prefSize = htmlComp.prefSize({
       exact: true
     }).add(graphics.margins(htmlComp.$comp));
+    if (item.fieldStatus && item.fieldStatus.htmlComp) {
+      let statusOverflownAndHidden = item.overflown && !item.fieldStatus.visible;
+      if (statusOverflownAndHidden) {
+        // overflown tabs have no fieldStatus: explicitly set to visible so that the real consumed space can be computed
+        item.fieldStatus.setVisible(true);
+      }
+      let statusWidth = item.fieldStatus.htmlComp.prefSize({includeMargin: true}).width;
+      if (statusOverflownAndHidden) {
+        // restore
+        item.fieldStatus.setVisible(false);
+      }
+      prefSize.width += statusWidth;
+    }
 
     htmlComp.$comp.attrOrRemove('class', classList);
 

package/src/form/fields/tabbox/TabBox.js

@@ -32,7 +32,6 @@ export default class TabBox extends CompositeField {
     this._addPreserveOnPropertyChangeProperties(['selectedTab']);
 
     this._tabBoxHeaderPropertyChangeHander = this._onTabBoxHeaderPropertyChange.bind(this);
-    this._selectedTabScrollTopChangeHandler = this._updateScrollShadow.bind(this);
   }
 
   /**
@@ -173,16 +172,17 @@ export default class TabBox extends CompositeField {
   _renderSelectedTab() {
     if (this.selectedTab) {
       this.selectedTab.render(this._$tabContent);
-      this.selectedTab.on('propertyChange:scrollTop', this._selectedTabScrollTopChangeHandler);
+      this.selectedTab.get$Scrollable().data('scroll-shadow-customizer', this._updateScrollShadow.bind(this));
     }
     if (this.rendered) {
+      this._updateScrollShadow();
       HtmlComponent.get(this._$tabContent).invalidateLayoutTree();
     }
   }
 
   _removeSelectedTab() {
     if (this.selectedTab) {
-      this.selectedTab.off('propertyChange:scrollTop', this._selectedTabScrollTopChangeHandler);
+      this.selectedTab.get$Scrollable().removeData('scroll-shadow-customizer');
       this.selectedTab.remove();
     }
   }
@@ -195,14 +195,11 @@ export default class TabBox extends CompositeField {
     let oldHasScrollShadowTop = this.$container.hasClass('has-scroll-shadow-top');
     this.$container.toggleClass('has-scroll-shadow-top', hasScrollShadowTop);
     if (oldHasScrollShadowTop !== hasScrollShadowTop) {
-      this.invalidateLayout();
+      this.invalidateLayoutTree(false);
     }
 
     // Enlarge header line if there is a shadow, but only if there is a header (controlled by labelVisible)
     fields.adjustStatusPositionForScrollShadow(this, () => hasScrollShadowTop && this.labelVisible);
-
-    // Prevent flickering of status icon
-    this.validateLayout();
   }
 
   setTabAreaStyle(tabAreaStyle) {

package/src/form/fields/tabbox/TabBox.less

@@ -74,7 +74,7 @@
   & > .menubar {
     position: absolute;
     #scout.menubar-background-color-inherit();
-    border-bottom-color: transparent;
+    border-bottom: none;
   }
 
   & > .status {
@@ -163,6 +163,7 @@
     display: inline-block;
     vertical-align: middle;
     padding: @tab-item-title-padding-top 0 @tab-item-title-padding-bottom;
+    margin-top: @text-margin-top;
 
     .tab-area.has-sub-label > & {
       padding-bottom: @group-box-title-with-sub-label-padding-bottom;

package/src/form/fields/tabbox/TabBoxHeaderLayout.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,14 +34,14 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
     this.tabBoxHeader.invalidateLayoutTree();
   }
 
-  layout($container) { //
+  layout($container) {
     let htmlContainer = HtmlComponent.get($container),
       tabArea = this.tabBoxHeader.tabArea,
       tabAreaMargins = tabArea.htmlComp.margins(),
       tabAreaPrefSize,
       menuBar = this.tabBoxHeader.menuBar,
       menuBarMargins = menuBar.htmlComp.margins(),
-      menuBarMinumumSize,
+      menuBarMinimumSize,
       $status = this.tabBoxHeader.tabBox.$status,
       statusSizeLarge = new Dimension(),
       insets = htmlContainer.insets(),
@@ -49,7 +49,7 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
         exact: true
       }).subtract(htmlContainer.insets());
 
-    menuBarMinumumSize = menuBar.htmlComp.prefSize({
+    menuBarMinimumSize = menuBar.htmlComp.prefSize({
       widthHint: 0
     });
 
@@ -59,7 +59,7 @@ export default class TabBoxHeaderLayout extends AbstractLayout {
     }
 
     tabAreaPrefSize = tabArea.htmlComp.prefSize({
-      widthHint: containerSize.width - menuBarMinumumSize.width - menuBarMargins.horizontal() - statusSizeLarge.width,
+      widthHint: containerSize.width - menuBarMinimumSize.width - menuBarMargins.horizontal() - statusSizeLarge.width,
       exact: false
     });
 

package/src/glasspane/GlassPane.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {scout, Widget} from '../index';
+import {Widget} from '../index';
 import $ from 'jquery';
 
 export default class GlassPane extends Widget {
@@ -24,7 +24,7 @@ export default class GlassPane extends Widget {
 
     this.$parent.addClass('glasspane-parent');
     let cssPosition = this.$parent.css('position');
-    if (!scout.isOneOf(cssPosition, 'relative', 'absolute')) {
+    if (cssPosition === 'static') {
       this.$parent.css('position', 'relative');
     }
 

package/src/group/Group.less

@@ -44,7 +44,7 @@
   #scout.overflow-ellipsis-nowrap();
 
   .group-header:focus > & {
-    color: @active-color;
+    color: @focus-color;
     text-decoration: underline;
   }
 }

package/src/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -605,6 +605,7 @@ export {default as FormFieldTile} from './tile/fields/FormFieldTile';
 export {default as FormFieldTileAdapter} from './tile/fields/FormFieldTileAdapter';
 export {default as ButtonTile} from './tile/fields/button/ButtonTile';
 export {default as TileButton} from './tile/fields/button/TileButton';
+export {default as TileHtmlField} from './tile/fields/htmlfield/TileHtmlField';
 export {default as TileTableField} from './tile/fields/tablefield/TileTableField';
 export {default as SimpleTab} from './tabbox/SimpleTab';
 export {default as SimpleTabArea} from './tabbox/SimpleTabArea';

package/src/index.less

@@ -144,5 +144,6 @@
 @import "tile/fields/tablefield/TileTableField";
 @import "widget/FilterSupport";
 @import "login/LoginBox";
+@import "form/fields/breadcrumbbarfield/BreadcrumbBarField";
 @import "breadcrumbbar/BreadcrumbBar";
 @import "breadcrumbbar/BreadcrumbItem";

package/src/jquery/jquery-scout.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1049,16 +1049,17 @@ $.fn.oneAnimationEnd = function(handler) {
   if (!handler) {
     return this;
   }
-  return this.on('animationend webkitAnimationEnd', event => {
+  let oneHandler = event => {
     if (event.target !== this[0]) {
       // Ignore events that bubble up from child elements
       return;
     }
     // Unregister listener to implement "one" semantics
-    this.off(event);
+    this.off('animationend webkitAnimationEnd', oneHandler);
     // Notify actual event handler
     handler(event);
-  });
+  };
+  return this.on('animationend webkitAnimationEnd', oneHandler);
 };
 
 $.fn.hasAnimationClass = function() {

package/src/login/LoginBox.less

@@ -53,18 +53,20 @@
  */
 .login-button.default {
 
-  &.login-error {
-    border-color: @palette-red-4;
-    background-color: @palette-red-4;
+  &.login-error:not(.disabled) {
+    border-color: transparent;
+    background-color: @error-color;
 
     &:hover {
-      background-color: @palette-red-4;
-      border-color: @palette-red-4;
+      background-color: @error-default-button-background-hover-color;
     }
 
     &:active {
-      border-color: @palette-red-4;
-      background-color: darken(@palette-red-4, 5%);
+      background-color: @error-default-button-background-active-color;
+    }
+
+    &:focus {
+      #scout.focus-border(@box-shadow-color: @error-focus-box-shadow-color, @border-color: mix(@error-color, @error-focus-box-shadow-color, 25%));
     }
   }
 

package/src/menu/ContextMenuPopup.less

@@ -53,14 +53,21 @@
     &.selected {
       background-color: @item-selection-background-color;
 
+      &.has-popup {
+        color: @context-menu-item-color;
+
+        &.disabled {
+          color: @menu-item-disabled-color;
+          background-color: @item-selection-background-color;
+        }
+      }
+
       & > .submenu-icon {
         transform: none;
       }
     }
 
     &.expanded {
-      color: @active-color;
-
       & > .submenu-icon {
         #scout.submenu-icon-open();
       }

package/src/menu/Menu.less

@@ -86,6 +86,7 @@
 
   & > .text {
     #scout.overflow-ellipsis-nowrap();
+    margin-top: @text-margin-top;
   }
 
   & > .font-icon {