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

[Frontend] Minor sanding

Browse Source 
WTD-894
Fix to correct spacing problem in object-header
This commit is contained in:
Charles Hacskaylo 2015-02-25 18:59:36 -08:00
parent 424d60440c
commit 068518b535
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/browse/res/templates/browse/object-header.html
View File

@ -1,6 +1,6 @@
<div class='object-header'> <div class='object-header'>
<span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span> <span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span>
<span class='action'>{{parameters.mode}}</span> <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
<span class='type'>{{type.getName()}}</span> <span class='type'>{{type.getName()}}</span>
<span class='title'>{{model.name}}</span> <span class='title'>{{model.name}}</span>
<a id='actions-menu' class='ui-symbol invoke-menu' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a> <a id='actions-menu' class='ui-symbol invoke-menu' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a>

10
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -629,9 +629,10 @@ span {
/* line 57, ../sass/_icons.scss */ /* line 57, ../sass/_icons.scss */
.object-header .type-icon { .object-header .type-icon {
color: #ffc700; } color: #ffc700;
margin-right: 5px; }
/* line 64, ../sass/_icons.scss */ /* line 65, ../sass/_icons.scss */
.menu .type-icon, .menu .type-icon,
.tree-item .type-icon, .tree-item .type-icon,
.icon-btn .menu.dropdown .icon, .icon-btn .menu.dropdown .icon,
@ -1366,12 +1367,11 @@ label.checkbox.custom {
/* line 366, ../sass/controls/_controls.scss */ /* line 366, ../sass/controls/_controls.scss */
.top-bar .object-header, .top-bar .object-header,
.object-browse-bar .object-header { .object-browse-bar .object-header {
font-size: 1.2em; } font-size: 1.1em; }
/* line 368, ../sass/controls/_controls.scss */ /* line 368, ../sass/controls/_controls.scss */
.top-bar .object-header span, .top-bar .object-header span,
.object-browse-bar .object-header span { .object-browse-bar .object-header span {
display: inline-block; display: inline-block; }
margin-right: 5px; }
/******************************************************** VIEW-CONTROLS */ /******************************************************** VIEW-CONTROLS */
/* line 377, ../sass/controls/_controls.scss */ /* line 377, ../sass/controls/_controls.scss */

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

@ -56,6 +56,7 @@
.object-header .type-icon { .object-header .type-icon {
color: $colorAlt1; color: $colorAlt1;
margin-right: $interiorMargin;
} }
.menu .type-icon, .menu .type-icon,

4
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@ -364,10 +364,10 @@ label.checkbox.custom {
.top-bar, .top-bar,
.object-browse-bar { .object-browse-bar {
.object-header { .object-header {
font-size: 1.2em; font-size: 1.1em;
span { span {
display: inline-block; display: inline-block;
margin-right: $interiorMargin; // margin-right: $interiorMargin;
} }
} }
} }