Skip to content

Commit 5d5425d

Browse files
charlesh88charlesh88
committed
[Frontend] Finessing and verifying CSS
vista#54 Verified against fixed position and scrolling views using SineWave generator; font-size of glyph tweaked;
1 parent a8856c0 commit 5d5425d

File tree

3 files changed

+174
-206
lines changed

3 files changed

+174
-206
lines changed

‎platform/commonUI/general/res/sass/_limits.scss

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,13 @@
33
color: $iconColor;
44
content: $glyph;
55
font-family: symbolsfont;
6+
font-size: 0.8em;
67
display: inline;
78
margin-right: $interiorMarginSm;
89
}
910

1011
}
1112

12-
/*[class*="s-limit"] {
13-
//white-space: nowrap;
14-
&:before {
15-
display: inline-block;
16-
font-family: symbolsfont;
17-
font-size: 0.75em;
18-
font-style: normal !important;
19-
margin-right: $interiorMarginSm;
20-
vertical-align: middle;
21-
}
22-
}*/
23-
2413
.s-limit-red { background: $colorLimitRedBg !important; }
2514
.s-limit-yellow { background: $colorLimitYellowBg !important; }
2615

@@ -37,6 +26,7 @@ tr[class*="s-limit"] {
3726
}
3827

3928
// Handle limit when applied directly to a non-tr element
29+
// Assume this is applied to the element that displays the limit value
4030
:not(tr)[class*="s-limit"] {
4131
&.s-limit-red {
4232
@include limitGlyph($colorLimitRedIc);

‎platform/commonUI/themes/espresso/res/css/theme-espresso.css

Lines changed: 86 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* this source code distribution or the Licensing information page available
2121
* at runtime from the About dialog for additional information.
2222
*****************************************************************************/
23-
/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
23+
/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
2424
html, body, div, span, applet, object, iframe,
2525
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
2626
a, abbr, acronym, address, big, cite, code,
@@ -41,38 +41,38 @@ time, mark, audio, video {
4141
font-size: 100%;
4242
vertical-align: baseline; }
4343

44-
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
44+
/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
4545
html {
4646
line-height: 1; }
4747

48-
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
48+
/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
4949
ol, ul {
5050
list-style: none; }
5151

52-
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
52+
/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
5353
table {
5454
border-collapse: collapse;
5555
border-spacing: 0; }
5656

57-
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
57+
/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
5858
caption, th, td {
5959
text-align: left;
6060
font-weight: normal;
6161
vertical-align: middle; }
6262

63-
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
63+
/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
6464
q, blockquote {
6565
quotes: none; }
66-
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
66+
/* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
6767
q:before, q:after, blockquote:before, blockquote:after {
6868
content: "";
6969
content: none; }
7070

71-
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
71+
/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
7272
a img {
7373
border: none; }
7474

75-
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
75+
/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
7676
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
7777
display: block; }
7878

@@ -147,6 +147,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
147147
/************************** CONTROLS */
148148
/************************** PATHS */
149149
/************************** TIMINGS */
150+
/************************** LIMITS */
150151
/*****************************************************************************
151152
* Open MCT Web, Copyright (c) 2014-2015, United States Government
152153
* as represented by the Administrator of the National Aeronautics and Space
@@ -657,46 +658,70 @@ mct-container {
657658
color: #ff3c00;
658659
content: "!"; }
659660

660-
/* line 13, ../../../../general/res/sass/_limits.scss */
661-
[class*="s-limit"]:before {
662-
display: inline-block;
663-
font-family: symbolsfont;
664-
font-size: 0.75em;
665-
font-style: normal !important;
666-
margin-right: 3px;
667-
vertical-align: middle; }
668-
669-
/* line 23, ../../../../general/res/sass/_limits.scss */
670-
.s-limit-upr-red {
661+
/*[class*="s-limit"] {
662+
//white-space: nowrap;
663+
&:before {
664+
display: inline-block;
665+
font-family: symbolsfont;
666+
font-size: 0.75em;
667+
font-style: normal !important;
668+
margin-right: $interiorMarginSm;
669+
vertical-align: middle;
670+
}
671+
}*/
672+
/* line 25, ../../../../general/res/sass/_limits.scss */
673+
.s-limit-red {
671674
background: rgba(255, 0, 0, 0.3) !important; }
672-
/* line 4, ../../../../general/res/sass/_limits.scss */
673-
.s-limit-upr-red:before {
674-
color: red;
675-
content: "ë"; }
676675

677-
/* line 24, ../../../../general/res/sass/_limits.scss */
678-
.s-limit-upr-yellow {
679-
background: rgba(255, 170, 0, 0.3) !important; }
680-
/* line 4, ../../../../general/res/sass/_limits.scss */
681-
.s-limit-upr-yellow:before {
682-
color: #ffaa00;
683-
content: "í"; }
684-
685-
/* line 25, ../../../../general/res/sass/_limits.scss */
686-
.s-limit-lwr-yellow {
676+
/* line 26, ../../../../general/res/sass/_limits.scss */
677+
.s-limit-yellow {
687678
background: rgba(255, 170, 0, 0.3) !important; }
688-
/* line 4, ../../../../general/res/sass/_limits.scss */
689-
.s-limit-lwr-yellow:before {
690-
color: #ffaa00;
691-
content: "ì"; }
692679

693-
/* line 26, ../../../../general/res/sass/_limits.scss */
694-
.s-limit-lwr-red {
695-
background: rgba(255, 0, 0, 0.3) !important; }
696-
/* line 4, ../../../../general/res/sass/_limits.scss */
697-
.s-limit-lwr-red:before {
698-
color: red;
699-
content: "î"; }
680+
/* line 2, ../../../../general/res/sass/_limits.scss */
681+
tr[class*="s-limit"].s-limit-red td:first-child:before {
682+
color: red;
683+
content: "";
684+
font-family: symbolsfont;
685+
font-size: 0.8em;
686+
display: inline;
687+
margin-right: 3px; }
688+
/* line 2, ../../../../general/res/sass/_limits.scss */
689+
tr[class*="s-limit"].s-limit-yellow td:first-child:before {
690+
color: #ffaa00;
691+
content: "";
692+
font-family: symbolsfont;
693+
font-size: 0.8em;
694+
display: inline;
695+
margin-right: 3px; }
696+
/* line 36, ../../../../general/res/sass/_limits.scss */
697+
tr[class*="s-limit"].s-limit-upr td:first-child:before {
698+
content: "ë"; }
699+
/* line 37, ../../../../general/res/sass/_limits.scss */
700+
tr[class*="s-limit"].s-limit-lwr td:first-child:before {
701+
content: "î"; }
702+
703+
/* line 2, ../../../../general/res/sass/_limits.scss */
704+
:not(tr)[class*="s-limit"].s-limit-red:before {
705+
color: red;
706+
content: "";
707+
font-family: symbolsfont;
708+
font-size: 0.8em;
709+
display: inline;
710+
margin-right: 3px; }
711+
/* line 2, ../../../../general/res/sass/_limits.scss */
712+
:not(tr)[class*="s-limit"].s-limit-yellow:before {
713+
color: #ffaa00;
714+
content: "";
715+
font-family: symbolsfont;
716+
font-size: 0.8em;
717+
display: inline;
718+
margin-right: 3px; }
719+
/* line 48, ../../../../general/res/sass/_limits.scss */
720+
:not(tr)[class*="s-limit"].s-limit-upr:before {
721+
content: "ë"; }
722+
/* line 49, ../../../../general/res/sass/_limits.scss */
723+
:not(tr)[class*="s-limit"].s-limit-lwr:before {
724+
content: "î"; }
700725

701726
/* line 1, ../../../../general/res/sass/_data-status.scss */
702727
.s-stale {
@@ -4142,32 +4167,10 @@ span.req {
41424167
height: auto;
41434168
max-height: 100%;
41444169
position: relative; }
4145-
/* line 228, ../../../../general/res/sass/search/_search.scss */
4170+
/* line 226, ../../../../general/res/sass/search/_search.scss */
41464171
.search .search-scroll .load-icon {
4147-
position: relative;
4148-
/* &.loading {
4149-
pointer-events: none;
4150-
margin-left: $leftMargin;
4151-
4152-
.title-label {
4153-
// Text styling
4154-
font-style: italic;
4155-
font-size: .9em;
4156-
opacity: 0.5;
4157-
4158-
// Text positioning
4159-
margin-left: $iconWidth + $leftMargin;
4160-
line-height: 24px;
4161-
}
4162-
.wait-spinner {
4163-
margin-left: $leftMargin;
4164-
}
4165-
}
4166-
4167-
&:not(.loading) {
4168-
cursor: pointer;
4169-
}*/ }
4170-
/* line 255, ../../../../general/res/sass/search/_search.scss */
4172+
position: relative; }
4173+
/* line 230, ../../../../general/res/sass/search/_search.scss */
41714174
.search .search-scroll .load-more-button {
41724175
margin-top: 5px 0;
41734176
font-size: 0.8em;
@@ -4438,21 +4441,7 @@ ul.tree {
44384441
height: 1.5rem;
44394442
line-height: 1.5rem;
44404443
margin-bottom: 3px;
4441-
position: relative;
4442-
/*
4443-
&.loading {
4444-
pointer-events: none;
4445-
.label {
4446-
opacity: 0.5;
4447-
.title-label {
4448-
font-style: italic;
4449-
}
4450-
}
4451-
.wait-spinner {
4452-
margin-left: 14px;
4453-
}
4454-
}
4455-
*/ }
4444+
position: relative; }
44564445
/* line 48, ../../../../general/res/sass/tree/_tree.scss */
44574446
.tree-item .view-control,
44584447
.search-result-item .view-control {
@@ -4499,7 +4488,7 @@ ul.tree {
44994488
.search-result-item .label .type-icon .icon.l-icon-alert {
45004489
position: absolute;
45014490
z-index: 2; }
4502-
/* line 90, ../../../../general/res/sass/tree/_tree.scss */
4491+
/* line 89, ../../../../general/res/sass/tree/_tree.scss */
45034492
.tree-item .label .type-icon .icon.l-icon-alert,
45044493
.search-result-item .label .type-icon .icon.l-icon-alert {
45054494
color: #ff3c00;
@@ -4509,7 +4498,7 @@ ul.tree {
45094498
width: 8px;
45104499
top: 1px;
45114500
right: -2px; }
4512-
/* line 96, ../../../../general/res/sass/tree/_tree.scss */
4501+
/* line 95, ../../../../general/res/sass/tree/_tree.scss */
45134502
.tree-item .label .type-icon .icon.l-icon-link,
45144503
.search-result-item .label .type-icon .icon.l-icon-link {
45154504
color: #49dedb;
@@ -4519,7 +4508,7 @@ ul.tree {
45194508
width: 8px;
45204509
left: -3px;
45214510
bottom: 0px; }
4522-
/* line 104, ../../../../general/res/sass/tree/_tree.scss */
4511+
/* line 103, ../../../../general/res/sass/tree/_tree.scss */
45234512
.tree-item .label .title-label,
45244513
.search-result-item .label .title-label {
45254514
overflow: hidden;
@@ -4535,47 +4524,47 @@ ul.tree {
45354524
overflow: hidden;
45364525
text-overflow: ellipsis;
45374526
white-space: nowrap; }
4538-
/* line 130, ../../../../general/res/sass/tree/_tree.scss */
4527+
/* line 113, ../../../../general/res/sass/tree/_tree.scss */
45394528
.tree-item.selected,
45404529
.search-result-item.selected {
45414530
background: #006080;
45424531
color: #cccccc; }
4543-
/* line 133, ../../../../general/res/sass/tree/_tree.scss */
4532+
/* line 116, ../../../../general/res/sass/tree/_tree.scss */
45444533
.tree-item.selected .view-control,
45454534
.search-result-item.selected .view-control {
45464535
color: rgba(255, 255, 255, 0.3); }
4547-
/* line 136, ../../../../general/res/sass/tree/_tree.scss */
4536+
/* line 119, ../../../../general/res/sass/tree/_tree.scss */
45484537
.tree-item.selected .label .type-icon,
45494538
.search-result-item.selected .label .type-icon {
45504539
color: #cccccc; }
45514540
@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) {
4552-
/* line 144, ../../../../general/res/sass/tree/_tree.scss */
4541+
/* line 127, ../../../../general/res/sass/tree/_tree.scss */
45534542
.tree-item:not(.selected):hover,
45544543
.search-result-item:not(.selected):hover {
45554544
background: rgba(153, 153, 153, 0.1);
45564545
color: #cccccc; }
4557-
/* line 150, ../../../../general/res/sass/tree/_tree.scss */
4546+
/* line 130, ../../../../general/res/sass/tree/_tree.scss */
45584547
.tree-item:not(.selected):hover .icon,
45594548
.search-result-item:not(.selected):hover .icon {
45604549
color: #33ccff; } }
4561-
/* line 157, ../../../../general/res/sass/tree/_tree.scss */
4550+
/* line 137, ../../../../general/res/sass/tree/_tree.scss */
45624551
.tree-item:not(.loading),
45634552
.search-result-item:not(.loading) {
45644553
cursor: pointer; }
4565-
/* line 161, ../../../../general/res/sass/tree/_tree.scss */
4554+
/* line 141, ../../../../general/res/sass/tree/_tree.scss */
45664555
.tree-item .context-trigger,
45674556
.search-result-item .context-trigger {
45684557
top: -1px;
45694558
position: absolute;
45704559
right: 3px; }
4571-
/* line 167, ../../../../general/res/sass/tree/_tree.scss */
4560+
/* line 146, ../../../../general/res/sass/tree/_tree.scss */
45724561
.tree-item .context-trigger .invoke-menu,
45734562
.search-result-item .context-trigger .invoke-menu {
45744563
font-size: 0.75em;
45754564
height: 0.9rem;
45764565
line-height: 0.9rem; }
45774566

4578-
/* line 176, ../../../../general/res/sass/tree/_tree.scss */
4567+
/* line 155, ../../../../general/res/sass/tree/_tree.scss */
45794568
.tree-item .label {
45804569
left: 15px; }
45814570

0 commit comments

Comments
 (0)