ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Fixes to scrolling and layout in Inspector

Browse Source 
open #638
In progress;
This commit is contained in:
Charles Hacskaylo 2016-02-02 10:30:40 -08:00 committed by Henry
parent e3a0cae5fd
commit 115ffe7963
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/browse/res/templates/browse/object-properties.html
View File

@ -20,8 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div ng-controller="ObjectInspectorController as controller"> <div ng-controller="ObjectInspectorController as controller">
<div class="pane-header flex-elem">Inspection</div> <ul class="flex-elem grows l-inspector-part">
<ul class="flex-elem grows vscroll">
<li> <li>
<em>Properties</em> <em>Properties</em>
<div class="inspector-properties" <div class="inspector-properties"

2
platform/commonUI/general/res/sass/_inspector.scss
View File

@ -57,7 +57,7 @@
} }
} }
ul { .l-inspector-part {
@include box-sizing(border-box); @include box-sizing(border-box);
padding-right: $interiorMargin; padding-right: $interiorMargin;
} }

6
platform/commonUI/general/res/templates/object-inspector.html
View File

@ -22,12 +22,14 @@
<span class="l-inspect"> <span class="l-inspect">
<div ng-controller="PaneController as modelPaneEdit"> <div ng-controller="PaneController as modelPaneEdit">
<mct-split-pane class='abs contents split-layout' anchor='bottom'> <mct-split-pane class='abs contents split-layout' anchor='bottom'>
<div class="split-pane-component pane top" style="overflow-y:auto;"> <div class="split-pane-component pane top">
<div class="abs holder holder-inspector l-flex-col"> <div class="abs holder holder-inspector l-flex-col">
<div class="pane-header flex-elem">Inspection</div>
<mct-representation <mct-representation
key="'inspector-region'" key="'inspector-region'"
mct-object="domainObject" mct-object="domainObject"
ng-model="ngModel"> ng-model="ngModel"
class="flex-elem grows vscroll l-flex-col">
</mct-representation> </mct-representation>
</div><!--/ holder-inspector --> </div><!--/ holder-inspector -->
</div><!--/ split-pane-component --> </div><!--/ split-pane-component -->

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

@ -1486,7 +1486,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before {
min-height: 20%; min-height: 20%;
max-height: 80%; } max-height: 80%; }
/* line 60, ../../../../general/res/sass/_inspector.scss */ /* line 60, ../../../../general/res/sass/_inspector.scss */
.l-inspect ul { .l-inspect .l-inspector-part {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;

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

@ -1467,7 +1467,7 @@ tr[class*="s-limit"].s-limit-lwr td:first-child:before {
min-height: 20%; min-height: 20%;
max-height: 80%; } max-height: 80%; }
/* line 60, ../../../../general/res/sass/_inspector.scss */ /* line 60, ../../../../general/res/sass/_inspector.scss */
.l-inspect ul { .l-inspect .l-inspector-part {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;

6
platform/features/layout/res/templates/plot-options-browse.html
View File

@ -1,4 +1,4 @@
<style> <!--<style>
.l-inspect .inspector-plot-options .plot-options-form .label { .l-inspect .inspector-plot-options .plot-options-form .label {
text-transform: none; text-transform: none;
} }
@ -19,9 +19,9 @@
.l-inspect .inspector-plot-options .plot-options-form .form .form-row.first { .l-inspect .inspector-plot-options .plot-options-form .form .form-row.first {
border-bottom: 1px solid rgba(255, 255, 255, 0.1); border-bottom: 1px solid rgba(255, 255, 255, 0.1);
} }
</style>-->
</style> <div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
<div ng-controller="PlotOptionsController" class="inspector-plot-options">
<em>Display</em> <em>Display</em>
<ul class="first flex-elem grows vscroll"> <ul class="first flex-elem grows vscroll">
<ul class="tree"> <ul class="tree">