aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormonikahedman <monika_hedman@brown.edu>2020-01-14 20:02:57 -0500
committermonikahedman <monika_hedman@brown.edu>2020-01-14 20:02:57 -0500
commitda6ce86f604ad5a6e7857f073ebba0095fc5d467 (patch)
tree205fbd550af87c6dde991a1f1ffe2913d22ecc38 /src
parent95e321930a5e6f5a6fd86047542615dff49813f2 (diff)
more minor changes
Diffstat (limited to 'src')
-rw-r--r--src/client/views/animationtimeline/Timeline.scss20
-rw-r--r--src/client/views/animationtimeline/Timeline.tsx7
2 files changed, 16 insertions, 11 deletions
diff --git a/src/client/views/animationtimeline/Timeline.scss b/src/client/views/animationtimeline/Timeline.scss
index 060627c17..02c1bdb16 100644
--- a/src/client/views/animationtimeline/Timeline.scss
+++ b/src/client/views/animationtimeline/Timeline.scss
@@ -1,6 +1,7 @@
@import "./../globalCssVariables.scss";
$timelineColor: #9acedf;
+$timelineDark: #77a1aa;
.timeline-toolbox {
position: absolute;
@@ -78,15 +79,15 @@ $timelineColor: #9acedf;
.tick {
height: 100%;
- width: 1px;
+ width: 2px;
background-color: black;
color: black;
}
.number-label {
color: black;
- padding-left: 5px;
-
+ transform: rotate(-90deg) translate(-15px, 8px);
+ font-size: .85em;
}
.timeline-container {
@@ -94,7 +95,7 @@ $timelineColor: #9acedf;
height: 300px;
position: absolute;
background-color: $light-color-secondary;
- box-shadow: 0px 10px 20px;
+ border-bottom: 2px solid $timelineDark;
transition: transform 500ms ease;
.info-container {
@@ -139,7 +140,7 @@ $timelineColor: #9acedf;
top: 30px;
height: calc(100% - 30px);
width: 100%;
- border: 1px;
+ border: 2px solid black;
overflow: hidden;
background-color: white;
position: absolute;
@@ -155,6 +156,9 @@ $timelineColor: #9acedf;
width: 100px;
background-color: white;
overflow: hidden;
+ border-left: 2px solid black;
+ border-top: 2px solid black;
+ border-bottom: 2px solid black;
.datapane {
top: 0px;
@@ -172,10 +176,10 @@ $timelineColor: #9acedf;
}
.resize {
- bottom: 5px;
+ bottom: 0px;
position: absolute;
- height: 30px;
- width: 50px;
+ height: 20px;
+ width: 40px;
left: calc(50% - 25px);
}
}
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index 2332b4d5f..37d93f6c1 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -401,11 +401,12 @@ export class Timeline extends React.Component<FieldViewProps> {
*/
private timelineToolBox = (scale: number) => {
let size = 40 * scale; //50 is default
+ let iconSize = 25;
return (
<div key="timeline_toolbox" className="timeline-toolbox" style={{ height: `${size}px` }}>
- <div className="timeline-icon" key="timeline_windBack" onClick={this.windBackward}> <FontAwesomeIcon icon={faBackward} style={{ height: `${size}px`, width: `${size}px` }} /> </div>
- <div className="timeline-icon" key=" timeline_play" onClick={this.onPlay}> <FontAwesomeIcon icon={this._playButton} style={{ height: `${size}px`, width: `${size}px` }} /> </div>
- <div className="timeline-icon" key="timeline_windForward" onClick={this.windForward}> <FontAwesomeIcon icon={faForward} style={{ height: `${size}px`, width: `${size}px` }} /> </div>
+ <div className="timeline-icon" key="timeline_windBack" onClick={this.windBackward}> <FontAwesomeIcon icon={faBackward} style={{ height: `${iconSize}px`, width: `${iconSize}px` }} /> </div>
+ <div className="timeline-icon" key=" timeline_play" onClick={this.onPlay}> <FontAwesomeIcon icon={this._playButton} style={{ height: `${iconSize}px`, width: `${iconSize}px` }} /> </div>
+ <div className="timeline-icon" key="timeline_windForward" onClick={this.windForward}> <FontAwesomeIcon icon={faForward} style={{ height: `${iconSize}px`, width: `${iconSize}px` }} /> </div>
<div key="overview-text" className="animation-text">Timeline Overview</div>
<TimelineOverview isAuthoring={BoolCast(this.props.Document.isATOn)} currentBarX={this._currentBarX} totalLength={this._totalLength} visibleLength={this._visibleLength} visibleStart={this._visibleStart} changeCurrentBarX={this.changeCurrentBarX} movePanX={this.movePanX} />
<div key="animation-text" className="animation-text">Mode: {this.props.Document.isATOn ? "Authoring" : "Play"}</div>