ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-12 04:08:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Frontend] Final sanding on adding s-status-pending

Browse Source 
open #431
Italicized text; Comments cleaned up;
To-do: fix regressed label elements in Inspector;
This commit is contained in:
Charles Hacskaylo
2015-12-16 16:38:06 -08:00
parent 7fb506d4df
commit ed3ee1099d
3 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/commonUI/general/res/sass/tree/_tree.scss
View File

@ -49,7 +49,7 @@ ul.tree {
color: $colorItemTreeVC; color: $colorItemTreeVC;
font-size: 0.75em; font-size: 0.75em;
margin-right: $interiorMargin; margin-right: $interiorMargin;
height: 100%; //$menuLineH; height: 100%;
line-height: inherit; line-height: inherit;
width: $treeVCW; width: $treeVCW;
&.has-children { &.has-children {
@ -93,12 +93,11 @@ ul.tree {
color: $colorItemTreeSelectedVC; color: $colorItemTreeSelectedVC;
} }
.t-object-label .t-item-icon { .t-object-label .t-item-icon {
color: $colorItemTreeSelectedFg; //$colorItemTreeIconHover; color: $colorItemTreeSelectedFg;
} }
} }
&:not(.selected) { &:not(.selected) {
// NOTE: [Mobile] Removed Hover on Mobile
@include desktop { @include desktop {
&:hover { &:hover {
background: $colorItemTreeHoverBg; background: $colorItemTreeHoverBg;
@ -148,7 +147,15 @@ ul.tree {
display: none; display: none;
} }
} }
.t-title-label {
font-style: italic;
opacity: 0.6;
}
} }
} }
} }
&.selected mct-representation.s-status-pending .t-object-label .t-item-icon:before {
border-color: rgba($colorItemTreeSelectedFg, 0.25);
border-top-color: rgba($colorItemTreeSelectedFg, 1.0);
}
} }

40
platform/commonUI/themes/espresso/res/css/theme-espresso.css
View File

@ -20,7 +20,7 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
@ -41,38 +41,38 @@ time, mark, audio, video {
font-size: 100%; font-size: 100%;
vertical-align: baseline; } vertical-align: baseline; }
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html { html {
line-height: 1; } line-height: 1; }
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
ol, ul { ol, ul {
list-style: none; } list-style: none; }
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; } border-spacing: 0; }
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
caption, th, td { caption, th, td {
text-align: left; text-align: left;
font-weight: normal; font-weight: normal;
vertical-align: middle; } vertical-align: middle; }
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q, blockquote { q, blockquote {
quotes: none; } quotes: none; }
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after { q:before, q:after, blockquote:before, blockquote:after {
content: ""; content: "";
content: none; } content: none; }
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
a img { a img {
border: none; } border: none; }
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block; } display: block; }
@ -5729,33 +5729,33 @@ ul.tree {
.search-result-item.selected .t-object-label .t-item-icon { .search-result-item.selected .t-object-label .t-item-icon {
color: #cccccc; } color: #cccccc; }
@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) {
/* line 103, ../../../../general/res/sass/tree/_tree.scss */ /* line 102, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover, .tree-item:not(.selected):hover,
.search-result-item:not(.selected):hover { .search-result-item:not(.selected):hover {
background: rgba(153, 153, 153, 0.1); background: rgba(153, 153, 153, 0.1);
color: #cccccc; } color: #cccccc; }
/* line 106, ../../../../general/res/sass/tree/_tree.scss */ /* line 105, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover .t-item-icon, .tree-item:not(.selected):hover .t-item-icon,
.search-result-item:not(.selected):hover .t-item-icon { .search-result-item:not(.selected):hover .t-item-icon {
color: #33ccff; } } color: #33ccff; } }
/* line 113, ../../../../general/res/sass/tree/_tree.scss */ /* line 112, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.loading), .tree-item:not(.loading),
.search-result-item:not(.loading) { .search-result-item:not(.loading) {
cursor: pointer; } cursor: pointer; }
/* line 117, ../../../../general/res/sass/tree/_tree.scss */ /* line 116, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger, .tree-item .context-trigger,
.search-result-item .context-trigger { .search-result-item .context-trigger {
top: -1px; top: -1px;
position: absolute; position: absolute;
right: 3px; } right: 3px; }
/* line 122, ../../../../general/res/sass/tree/_tree.scss */ /* line 121, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger .invoke-menu, .tree-item .context-trigger .invoke-menu,
.search-result-item .context-trigger .invoke-menu { .search-result-item .context-trigger .invoke-menu {
font-size: 0.75em; font-size: 0.75em;
height: 0.9rem; height: 0.9rem;
line-height: 0.9rem; } line-height: 0.9rem; }
/* line 135, ../../../../general/res/sass/tree/_tree.scss */ /* line 134, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-item-icon:before { .tree-item mct-representation.s-status-pending .t-object-label .t-item-icon:before {
-moz-animation-name: rotateCentered; -moz-animation-name: rotateCentered;
-webkit-animation-name: rotateCentered; -webkit-animation-name: rotateCentered;
@ -5808,9 +5808,17 @@ ul.tree {
-ms-transform: translateX(-50%) translateY(-50%) rotate(359deg); -ms-transform: translateX(-50%) translateY(-50%) rotate(359deg);
-webkit-transform: translateX(-50%) translateY(-50%) rotate(359deg); -webkit-transform: translateX(-50%) translateY(-50%) rotate(359deg);
transform: translateX(-50%) translateY(-50%) rotate(359deg); } } transform: translateX(-50%) translateY(-50%) rotate(359deg); } }
/* line 147, ../../../../general/res/sass/tree/_tree.scss */ /* line 146, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-item-icon .t-item-icon-glyph { .tree-item mct-representation.s-status-pending .t-object-label .t-item-icon .t-item-icon-glyph {
display: none; } display: none; }
/* line 150, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-title-label {
font-style: italic;
opacity: 0.6; }
/* line 157, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.selected mct-representation.s-status-pending .t-object-label .t-item-icon:before {
border-color: rgba(204, 204, 204, 0.25);
border-top-color: #cccccc; }
/***************************************************************************** /*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government * Open MCT Web, Copyright (c) 2014-2015, United States Government

40
platform/commonUI/themes/snow/res/css/theme-snow.css
View File

@ -20,7 +20,7 @@
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe, html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
@ -41,38 +41,38 @@ time, mark, audio, video {
font-size: 100%; font-size: 100%;
vertical-align: baseline; } vertical-align: baseline; }
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html { html {
line-height: 1; } line-height: 1; }
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
ol, ul { ol, ul {
list-style: none; } list-style: none; }
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; } border-spacing: 0; }
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
caption, th, td { caption, th, td {
text-align: left; text-align: left;
font-weight: normal; font-weight: normal;
vertical-align: middle; } vertical-align: middle; }
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q, blockquote { q, blockquote {
quotes: none; } quotes: none; }
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after { q:before, q:after, blockquote:before, blockquote:after {
content: ""; content: "";
content: none; } content: none; }
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
a img { a img {
border: none; } border: none; }
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ /* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block; } display: block; }
@ -5632,33 +5632,33 @@ ul.tree {
.search-result-item.selected .t-object-label .t-item-icon { .search-result-item.selected .t-object-label .t-item-icon {
color: #fcfcfc; } color: #fcfcfc; }
@media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) { @media only screen and (min-device-width: 1025px) and (-webkit-min-device-pixel-ratio: 1) {
/* line 103, ../../../../general/res/sass/tree/_tree.scss */ /* line 102, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover, .tree-item:not(.selected):hover,
.search-result-item:not(.selected):hover { .search-result-item:not(.selected):hover {
background: rgba(102, 102, 102, 0.1); background: rgba(102, 102, 102, 0.1);
color: #333333; } color: #333333; }
/* line 106, ../../../../general/res/sass/tree/_tree.scss */ /* line 105, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover .t-item-icon, .tree-item:not(.selected):hover .t-item-icon,
.search-result-item:not(.selected):hover .t-item-icon { .search-result-item:not(.selected):hover .t-item-icon {
color: #0099cc; } } color: #0099cc; } }
/* line 113, ../../../../general/res/sass/tree/_tree.scss */ /* line 112, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.loading), .tree-item:not(.loading),
.search-result-item:not(.loading) { .search-result-item:not(.loading) {
cursor: pointer; } cursor: pointer; }
/* line 117, ../../../../general/res/sass/tree/_tree.scss */ /* line 116, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger, .tree-item .context-trigger,
.search-result-item .context-trigger { .search-result-item .context-trigger {
top: -1px; top: -1px;
position: absolute; position: absolute;
right: 3px; } right: 3px; }
/* line 122, ../../../../general/res/sass/tree/_tree.scss */ /* line 121, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger .invoke-menu, .tree-item .context-trigger .invoke-menu,
.search-result-item .context-trigger .invoke-menu { .search-result-item .context-trigger .invoke-menu {
font-size: 0.75em; font-size: 0.75em;
height: 0.9rem; height: 0.9rem;
line-height: 0.9rem; } line-height: 0.9rem; }
/* line 135, ../../../../general/res/sass/tree/_tree.scss */ /* line 134, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-item-icon:before { .tree-item mct-representation.s-status-pending .t-object-label .t-item-icon:before {
-moz-animation-name: rotateCentered; -moz-animation-name: rotateCentered;
-webkit-animation-name: rotateCentered; -webkit-animation-name: rotateCentered;
@ -5711,9 +5711,17 @@ ul.tree {
-ms-transform: translateX(-50%) translateY(-50%) rotate(359deg); -ms-transform: translateX(-50%) translateY(-50%) rotate(359deg);
-webkit-transform: translateX(-50%) translateY(-50%) rotate(359deg); -webkit-transform: translateX(-50%) translateY(-50%) rotate(359deg);
transform: translateX(-50%) translateY(-50%) rotate(359deg); } } transform: translateX(-50%) translateY(-50%) rotate(359deg); } }
/* line 147, ../../../../general/res/sass/tree/_tree.scss */ /* line 146, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-item-icon .t-item-icon-glyph { .tree-item mct-representation.s-status-pending .t-object-label .t-item-icon .t-item-icon-glyph {
display: none; } display: none; }
/* line 150, ../../../../general/res/sass/tree/_tree.scss */
.tree-item mct-representation.s-status-pending .t-object-label .t-title-label {
font-style: italic;
opacity: 0.6; }
/* line 157, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.selected mct-representation.s-status-pending .t-object-label .t-item-icon:before {
border-color: rgba(252, 252, 252, 0.25);
border-top-color: #fcfcfc; }
/***************************************************************************** /*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government * Open MCT Web, Copyright (c) 2014-2015, United States Government