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

[Frontend/PLATFORM] Cherry picking from platform changes in vista65

Browse Source 
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
This commit is contained in:
Charles Hacskaylo 2015-09-16 15:52:56 -07:00
parent 4f5a1115d2
commit f28d2f19d0
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,10 @@ $pad: $interiorMargin * $baseRatio;
vertical-align: top; vertical-align: top;
} }
&.lg {
font-size: 1rem;
}
&.sm { &.sm {
padding: 0 $pad / $baseRatio; padding: 0 $pad / $baseRatio;
} }

6
platform/commonUI/general/res/sass/forms/_channel-selector.scss
View File

@ -36,11 +36,11 @@
.btns-add-remove { .btns-add-remove {
// background: rgba(#ff0000, 0.3);; // background: rgba(#ff0000, 0.3);;
margin-top: 150px; margin-top: 150px;
.btn { .s-btn {
display: block; display: block;
font-size: 1.5em; //font-size: 1.5em;
margin-bottom: $interiorMargin; margin-bottom: $interiorMargin;
padding: 10px; //padding: 10px;
text-align: center; text-align: center;
} }
} }

4
platform/commonUI/general/res/templates/controls/selector.html
View File

@ -43,11 +43,11 @@
</div> </div>
<div class='col col-2'> <div class='col col-2'>
<div class='btn-holder valign-mid btns-add-remove'> <div class='btn-holder valign-mid btns-add-remove'>
<a class='btn major' <a class='s-btn major'
ng-click="selector.select(selector.treeModel.selectedObject)"> ng-click="selector.select(selector.treeModel.selectedObject)">
<span class='ui-symbol'>&gt;</span> <span class='ui-symbol'>&gt;</span>
</a> </a>
<a class='btn major' <a class='s-btn major'
ng-click="selector.deselect(selector.listModel.selectedObject)"> ng-click="selector.deselect(selector.listModel.selectedObject)">
<span class='ui-symbol'>&lt;</span> <span class='ui-symbol'>&lt;</span>
</a> </a>

2
platform/features/layout/bundle.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Layout components.", "name": "Layout components.",
"description": "Plug in adding Layout capabiltiies.", "description": "Plug in adding Layout capabilities.",
"extensions": { "extensions": {
"views": [ "views": [
{ {

3
platform/features/layout/src/elements/ElementFactory.js
View File

@ -44,8 +44,7 @@ define(
}, },
"fixed.text": { "fixed.text": {
fill: "transparent", fill: "transparent",
stroke: "transparent", stroke: "transparent"
color: "#cccccc"
} }
}, },
DIALOGS = { DIALOGS = {