From 52b30ce1ba6748c1d0a0f8697df3e66c53b2c315 Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Mon, 8 Apr 2019 17:06:24 -0400 Subject: Timeline Grapical Change --- src/client/views/nodes/PDFBox.tsx | 3 ++- src/client/views/nodes/Timeline.scss | 23 +++++++++++++++++++++++ src/client/views/nodes/Timeline.tsx | 23 ++++++++++++++++------- 3 files changed, 41 insertions(+), 8 deletions(-) (limited to 'src/client/views/nodes') diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx index 28a1f9757..4682753d7 100644 --- a/src/client/views/nodes/PDFBox.tsx +++ b/src/client/views/nodes/PDFBox.tsx @@ -151,6 +151,7 @@ export class PDFBox extends React.Component { */ makeEditableAndHighlight = (colour: string) => { var range, sel = window.getSelection(); + if (sel) { if (sel.rangeCount && sel.getRangeAt) { range = sel.getRangeAt(0); } @@ -189,7 +190,7 @@ export class PDFBox extends React.Component { } this._pageInfo.divs.push(obj); - } + }} document.designMode = "off"; } diff --git a/src/client/views/nodes/Timeline.scss b/src/client/views/nodes/Timeline.scss index e69de29bb..b58828c0f 100644 --- a/src/client/views/nodes/Timeline.scss +++ b/src/client/views/nodes/Timeline.scss @@ -0,0 +1,23 @@ +.timeline-container{ + top: 10px; + left: 400px; + height: 100px; + width: 500px; + background-color: yellow; + position: absolute; + + .timeline{ + height: 50px; + width: 500px; + bottom: 0px; + background-color: grey; + position: absolute; + + } + button{ + height: 30px; + width: 100px; + font-size: 1em; + position:relative; + } +} \ No newline at end of file diff --git a/src/client/views/nodes/Timeline.tsx b/src/client/views/nodes/Timeline.tsx index c3546c802..3bd549ccc 100644 --- a/src/client/views/nodes/Timeline.tsx +++ b/src/client/views/nodes/Timeline.tsx @@ -1,18 +1,27 @@ import * as React from "react" import * as ReactDOM from "react-dom" -import {observer} from "mobx-react" -import {observable} from "mobx" +import { observer } from "mobx-react" +import { observable } from "mobx" import { TimelineField } from "../../../fields/TimelineField"; +import "./Timeline.scss" @observer export class Timeline extends React.Component{ - render(){ - return( -
-

hi

-
) + render() { + return ( +
+
+
+ + +
+ + +
+
+ ) } } \ No newline at end of file -- cgit v1.2.3-70-g09d2