Tree/Table: use text color for control icon

The icon is currently very light, nearly invisible to the user -> use
same color as text.

3 files changed, 7 insertions, 4 deletions

diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/colors.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/colors.less
index aadb17f229..4df278f31f 100644
--- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/colors.less
+++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/colors.less
@@ -269,6 +269,7 @@
 @table-row-checked-background-color: @palette-blue-5;
 @table-row-checked-selected-focus-background-color: lighten(@palette-blue-5, 22%);
 @table-row-checked-selected-background-color: greyscale(@table-row-checked-selected-focus-background-color);
+@table-row-control-color: @tree-node-control-color;
 @tab-area-border-color: @border-color;
 @tab-item-color: @title-color;
 @tab-item-active-color: @active-color;
@@ -331,7 +332,7 @@
 @tooltip-error-border-color: @error-color;
 @tooltip-error-color: @error-color;
 @tree-node-active-background-color: @palette-gray-2;
-@tree-node-control-color: @border-color;
+@tree-node-control-color: inherit;
 @view-button-tab-active-background-color: @navigation-background-color;
 @view-button-tab-active-color: @active-inverted-color;
 @view-button-tab-background-color: @panel-background-color;
diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/sizes.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/sizes.less
index 2446090178..075a38bcc0 100644
--- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/sizes.less
+++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/style/sizes.less
@@ -186,6 +186,8 @@
 @table-header-sort-icon-size-2: @table-header-sort-icon-size-1 + 12px; /* bigger space when multiple icons are displayed */
 @table-menubar-padding: 8px;
 @table-row-padding-y: 7px;
+@table-row-control-padding-left: @tree-node-control-padding-left;
+@table-row-control-size: @tree-node-control-size;
 @tag-field-tag-height: @logical-grid-row-height - 2px - 2 * @tag-field-tag-margin-y;
 @tag-field-tag-margin-y: 3px;
 @tag-field-tag-margin-right: @tag-field-tag-margin-y;
diff --git a/org.eclipse.scout.rt.ui.html/src/main/js/scout/table/Table.less b/org.eclipse.scout.rt.ui.html/src/main/js/scout/table/Table.less
index 76bad1fe54..9fab484841 100644
--- a/org.eclipse.scout.rt.ui.html/src/main/js/scout/table/Table.less
+++ b/org.eclipse.scout.rt.ui.html/src/main/js/scout/table/Table.less
@@ -258,7 +258,7 @@
       position: absolute;
       top: 0;
       left: 0;
-      padding: @table-row-padding-y 8px @table-row-padding-y @tree-node-control-padding-left;
+      padding: @table-row-padding-y 8px @table-row-padding-y @table-row-control-padding-left;
       line-height: 14px;
       cursor: pointer;
 
@@ -266,9 +266,9 @@
         display: block;
         transition: transform 0.3s;
         #scout.font-icon();
-        font-size: @tree-node-control-size;
+        font-size: @table-row-control-size;
         content: @icon-angle-right;
-        color: @tree-node-control-color;
+        color: @table-row-control-color;
 
         .expanded& {
           /* This "imprecise" angle is a workround for firefox to prevent shifting the div a little when the animation finishes. */