From fc49e5d02303118b6e498a99d2d75ef1d9398da2 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 18 Sep 2017 15:07:35 -0700 Subject: [PATCH] [Front-end] WIP Markup and CSS for Follow Line Fixes #1688 Moved TimelineTOIController up 2 levels of markup hierarchy to allow Follow Lines, one in each split pane; Follow LInes markup and CSS in progress; --- .../timeline/res/sass/_timelines.scss | 3 +- .../timeline/res/templates/timeline.html | 201 +++++++++--------- 2 files changed, 105 insertions(+), 99 deletions(-) diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index dd73d55a44..c9d0553653 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -329,6 +329,7 @@ // Follow Line .l-follow-line { + pointer-events: none; position: absolute; top: 0; bottom: 0; width: 1px; @@ -336,7 +337,7 @@ } .s-follow-line { - background: rgba(red, 0.5); + background: rgba($timeControllerToiLineColor, 0.5); } } diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html index 73505a4635..8ed8b4ab9d 100644 --- a/platform/features/timeline/res/templates/timeline.html +++ b/platform/features/timeline/res/templates/timeline.html @@ -96,119 +96,124 @@ - + - -
-
- - + +
+ + + +
-
- - - -
+
+ + +
+ -
-
-
+
+
+
- - + + - - - - + + + + +
+
-
-
- - + + - -
-
-
- - + +
+
+
+ + +
+ +
+
+
+
+
-
-
-
-
-
-
- + + + +