diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 8bde2cd7b8..659025960f 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -100,7 +100,9 @@ $reqSymbolM: $interiorMargin * 2; $reqSymbolFontSize: 0.7em; // Wait Spinner Defaults $waitSpinnerD: 32px; +$waitSpinnerTreeD: 20px; $waitSpinnerBorderW: 5px; +$waitSpinnerTreeBorderW: 4px; /************************** CONTROLS */ $controlDisabledOpacity: 0.3; diff --git a/platform/commonUI/general/res/sass/_object-label.scss b/platform/commonUI/general/res/sass/_object-label.scss index 76e55a04fe..6fad6780a2 100644 --- a/platform/commonUI/general/res/sass/_object-label.scss +++ b/platform/commonUI/general/res/sass/_object-label.scss @@ -35,15 +35,15 @@ } } -mct-representation { +mct-representation, +.rep-object-label { &.s-status-pending { .t-object-label { .t-item-icon { &:before { - $spinBW: 4px; - @include spinner($spinBW); + @include spinner($waitSpinnerTreeBorderW, $colorLoadingFg); content: ""; - padding: 30%; + height: $waitSpinnerTreeD; width: $waitSpinnerTreeD; } .t-item-icon-glyph { display: none; @@ -57,7 +57,10 @@ mct-representation { } } -.selected mct-representation.s-status-pending .t-object-label .t-item-icon:before { - border-color: rgba($colorItemTreeSelectedFg, 0.25) !important; - border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important; +.selected mct-representation, +.selected .rep-object-label { + .s-status-pending .t-object-label .t-item-icon:before { + border-color: rgba($colorItemTreeSelectedFg, 0.25) !important; + border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important; + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss index 565d8f0ef2..46f94ebc53 100644 --- a/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss +++ b/platform/commonUI/general/res/sass/helpers/_wait-spinner.scss @@ -28,7 +28,7 @@ 100% { @include transform(translate(-50%, -50%) rotate(360deg)); } } -@mixin spinner($b: 5px, $c: $colorKey) { +@mixin spinner($b: 5px, $c: $colorKey) { @include transform-origin(center); @include animation-name(rotation-centered); @include animation-duration(0.5s); @@ -76,14 +76,17 @@ z-index: 9; } &.tree-item.t-wait-node { - $d: $treeTypeIconW; + $d: $waitSpinnerTreeD; $spinnerL: $treeVCW + $interiorMargin + 3px + $d/2; - font-style: italic; padding-left: $spinnerL + $d/2 + $interiorMargin; + .t-title-label { + font-style: italic; + opacity: 0.6; + } &:before { height: $d; width: $d; - border-width: 3px; + border-width: 4px; left: $spinnerL; } &:after { diff --git a/platform/commonUI/general/res/templates/tree/wait-node.html b/platform/commonUI/general/res/templates/tree/wait-node.html index 12bcecdc34..d63095c0a0 100644 --- a/platform/commonUI/general/res/templates/tree/wait-node.html +++ b/platform/commonUI/general/res/templates/tree/wait-node.html @@ -19,4 +19,6 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -