diff options
| author | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-05-04 17:14:03 -0400 |
|---|---|---|
| committer | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-05-04 17:14:03 -0400 |
| commit | 654baafc6d144777f0d31d0dc720c2586b597022 (patch) | |
| tree | 04c593869caeb67ced87eea7430a366be4181b15 /src/client/views/nodes/RecordingBox | |
| parent | a9ff0c90656de71e37edafba68e946807d41403f (diff) | |
| parent | 51b4d65fe05939ea27639bc1b5cc66ec99fa54e5 (diff) | |
Merge with jenny bug fixes
Diffstat (limited to 'src/client/views/nodes/RecordingBox')
| -rw-r--r-- | src/client/views/nodes/RecordingBox/RecordingBox.tsx | 3 | ||||
| -rw-r--r-- | src/client/views/nodes/RecordingBox/RecordingView.scss | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/RecordingBox/RecordingView.tsx | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/client/views/nodes/RecordingBox/RecordingBox.tsx b/src/client/views/nodes/RecordingBox/RecordingBox.tsx index 1b17476f7..d00f05759 100644 --- a/src/client/views/nodes/RecordingBox/RecordingBox.tsx +++ b/src/client/views/nodes/RecordingBox/RecordingBox.tsx @@ -40,7 +40,8 @@ export class RecordingBox extends ViewBoxBaseComponent() { // console.log(this.videoDuration) this.dataDoc[this.fieldKey + "-duration"] = this.videoDuration; - this.layoutDoc.layout = VideoBox.LayoutString(this.fieldKey); + // this.layoutDoc.layout = VideoBox.LayoutString(this.fieldKey); + this.dataDoc.layout = VideoBox.LayoutString(this.fieldKey); // this.dataDoc.nativeWidth = this.dataDoc.nativeHeight = undefined; // this.layoutDoc._fitWidth = undefined; this.dataDoc[this.props.fieldKey] = new VideoField(this.result.accessPaths.agnostic.client); diff --git a/src/client/views/nodes/RecordingBox/RecordingView.scss b/src/client/views/nodes/RecordingBox/RecordingView.scss index d1a50a82e..c55af5952 100644 --- a/src/client/views/nodes/RecordingBox/RecordingView.scss +++ b/src/client/views/nodes/RecordingBox/RecordingView.scss @@ -46,7 +46,7 @@ button { padding: 14px; width: 100%; max-width: 500px; - max-height: 20%; + // max-height: 20%; flex-wrap: wrap; background: rgba(255, 255, 255, 0.25); box-shadow: 0 8px 32px 0 rgba(255, 255, 255, 0.1); diff --git a/src/client/views/nodes/RecordingBox/RecordingView.tsx b/src/client/views/nodes/RecordingBox/RecordingView.tsx index e7e431b49..0a8294dcf 100644 --- a/src/client/views/nodes/RecordingBox/RecordingView.tsx +++ b/src/client/views/nodes/RecordingBox/RecordingView.tsx @@ -86,8 +86,6 @@ export function RecordingView(props: IRecordingViewProps) { } }) - // this.dataDoc[this.fieldKey + "-duration"] = (new Date().getTime() - this.recordingStart!) / 1000; - } @@ -282,9 +280,9 @@ export function RecordingView(props: IRecordingViewProps) { {!recording && videos.length > 0 ? <div className="video-edit-wrapper"> - <IconContext.Provider value={{ color: "grey", className: "video-edit-buttons" }}> + {/* <IconContext.Provider value={{ color: "grey", className: "video-edit-buttons" }}> <MdBackspace onClick={clearPrevious} /> - </IconContext.Provider> + </IconContext.Provider> */} <IconContext.Provider value={{ color: "#cc1c08", className: "video-edit-buttons" }}> <FaCheckCircle onClick={stop} /> </IconContext.Provider> |