ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Final sanding on label flex-box conversion

Browse Source 
open #431
Fixed positioning for l-icon-link when applied to
inspection-location object;
This commit is contained in:
Charles Hacskaylo 2015-12-16 16:49:16 -08:00
parent ed3ee1099d
commit 9dc958b952
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/general/res/sass/_icons.scss
View File

@ -85,9 +85,12 @@
// Used in grid-item.html, tree-item, inspector location, more?
@extend .ui-symbol;
@extend .icon;
display: inline-block;
//display: inline-block;
line-height: normal; // This is Ok for the symbolsfont
position: relative;
.t-item-icon-glyph {
position: relative;
}
&.l-icon-link {
.t-item-icon-glyph {
&:before {

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

@ -72,7 +72,6 @@ ul.tree {
.t-object-label {
line-height: $menuLineH;
.t-item-icon {
@include txtShdwSubtle($shdwItemTreeIcon);
font-size: $treeTypeIconH;
@ -80,7 +79,6 @@ ul.tree {
margin-right: $interiorMargin;
width: $treeTypeIconW;
}
.title-label,
.t-title-label {
@include ellipsize();
}

12
platform/commonUI/general/res/templates/label.html
View File

@ -19,9 +19,9 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<span class="t-object-label l-flex-row flex-elem grows">
<span class="t-item-icon flex-elem" ng-class="{ 'l-icon-link':location.isLink() }">
<span class="t-item-icon-glyph">{{type.getGlyph()}}</span>
</span>
<span class='t-title-label flex-elem grows'>{{model.name}}</span>
</span>
<div class="t-object-label l-flex-row flex-elem grows">
<div class="t-item-icon flex-elem" ng-class="{ 'l-icon-link':location.isLink() }">
<div class="t-item-icon-glyph">{{type.getGlyph()}}</div>
</div>
<div class='t-title-label flex-elem grows'>{{model.name}}</div>
</div>

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

@ -830,10 +830,12 @@ mct-container {
/* line 84, ../../../../general/res/sass/_icons.scss */
.t-item-icon {
display: inline-block;
line-height: normal;
position: relative; }
/* line 93, ../../../../general/res/sass/_icons.scss */
/* line 91, ../../../../general/res/sass/_icons.scss */
.t-item-icon .t-item-icon-glyph {
position: relative; }
/* line 96, ../../../../general/res/sass/_icons.scss */
.t-item-icon.l-icon-link .t-item-icon-glyph:before {
color: #49dedb;
content: "\f4";

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

@ -830,10 +830,12 @@ mct-container {
/* line 84, ../../../../general/res/sass/_icons.scss */
.t-item-icon {
display: inline-block;
line-height: normal;
position: relative; }
/* line 93, ../../../../general/res/sass/_icons.scss */
/* line 91, ../../../../general/res/sass/_icons.scss */
.t-item-icon .t-item-icon-glyph {
position: relative; }
/* line 96, ../../../../general/res/sass/_icons.scss */
.t-item-icon.l-icon-link .t-item-icon-glyph:before {
color: #49dedb;
content: "\f4";