ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-28 06:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request from nasa/open913

Browse Source 
R&I open913: various Timeline fixes
This commit is contained in:
Victor Woeltjen 2016-05-26 11:47:06 -07:00
commit 04112956cf
4 changed files with 21 additions and 14 deletions

20
platform/features/timeline/res/sass/_activities.scss

@ -1,16 +1,22 @@
.l-timeline-gantt { .l-timeline-gantt {
min-width: 2px;
overflow: hidden;
position: absolute; position: absolute;
top: $timelineSwimlaneGanttVM; bottom: $timelineSwimlaneGanttVM; top: $timelineSwimlaneGanttVM; bottom: $timelineSwimlaneGanttVM;
.bar { .bar {
@include ellipsize(); @include ellipsize();
height: $activityBarH; height: $activityBarH;
line-height: $activityBarH + 2; line-height: $activityBarH;
padding: 0 $interiorMargin; padding: 0 $interiorMargin;
span { span {
display: inline; $iconW: 20px;
@include absPosDefault();
display: block;
&.s-activity-type { &.s-activity-type {
right: auto; width: $iconW;
text-align: center;
&.timeline { &.timeline {
&:before { &:before {
content:"S"; content:"S";
@ -23,7 +29,9 @@
} }
} }
&.s-title { &.s-title {
text-shadow: rgba(black, 0.1) 0 1px 2px; overflow: hidden;
text-overflow: ellipsis;
left: $iconW;
} }
&.duration { &.duration {
left: auto; left: auto;
@ -52,6 +60,10 @@
} }
} }
} }
&.sm .bar span {
// Hide icon and label if width is too small
display: none;
}
} }
.edit-mode .s-timeline-gantt, .edit-mode .s-timeline-gantt,
@ -59,7 +71,7 @@
.handle { .handle {
cursor: col-resize; cursor: col-resize;
&.mid { &.mid {
cursor: move; cursor: ew-resize;
} }
} }
} }

10
platform/features/timeline/res/sass/_timeline-thematic.scss

@ -32,20 +32,10 @@
} }
.s-timeline-gantt { .s-timeline-gantt {
$br: $controlCr;
.bar { .bar {
color: $colorGanttBarFg; color: $colorGanttBarFg;
@include activityBg($colorGanttBarBg); @include activityBg($colorGanttBarBg);
border-radius: $br;
box-shadow: $shdwGanttBar; box-shadow: $shdwGanttBar;
&.expanded {
@include border-top-radius($br);
@include border-bottom-radius(0);
}
&.leaf {
@include border-top-radius(0);
@include border-bottom-radius($br);
}
.s-toggle { .s-toggle {
color: $colorGanttToggle; color: $colorGanttToggle;
} }

4
platform/features/timeline/res/sass/_timelines.scss

@ -52,6 +52,9 @@
// Tree area with item title // Tree area with item title
right: auto; // Set this to auto and uncomment width below when additional tabular columns are added right: auto; // Set this to auto and uncomment width below when additional tabular columns are added
width: $timelineTabularTitleW; width: $timelineTabularTitleW;
.l-swimlanes-holder {
bottom: $scrollbarTrackSize;
}
} }
&.l-tabular-r { &.l-tabular-r {
// Start, end, duration, activity modes columns // Start, end, duration, activity modes columns
@ -67,6 +70,7 @@
&.l-timeline-gantt { &.l-timeline-gantt {
.l-swimlanes-holder { .l-swimlanes-holder {
@include scrollV(scroll); @include scrollV(scroll);
bottom: $scrollbarTrackSize;
} }
} }
&.l-timeline-resource-legend { &.l-timeline-resource-legend {

1
platform/features/timeline/res/templates/activity-gantt.html

@ -20,6 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div class="t-timeline-gantt l-timeline-gantt s-timeline-gantt" <div class="t-timeline-gantt l-timeline-gantt s-timeline-gantt"
ng-class="{ sm: gantt.width(timespan, parameters.scroll, parameters.toPixels) < 25 }"
title="{{model.name}}" title="{{model.name}}"
ng-controller="TimelineGanttController as gantt" ng-controller="TimelineGanttController as gantt"
ng-style="timespan ? { ng-style="timespan ? {