Skip to content

Commit 656e2fb

Browse files
AnthonytorreroAnthonytorrero
authored andcommitted
merged eddy's tutorial code
2 parents 9084bc7 + 4d1f714 commit 656e2fb

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

app/src/Dashboard/styles.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* @import url('https://fonts.googleapis.com/css2?family=Cabin&family=Oswald&display=swap');
22
33
4+
45
$primary-black: #22292f;
56
$secondary-black: #606f7b;
67
$teriary-grey: #f0f0f0;
@@ -10,12 +11,10 @@ $button-blue: #24BCFF; */
1011

1112

1213
.form , .project{
13-
display: flex;
14-
flex-direction: column;
15-
background-color: white;
16-
border: 1px solid #f0f0f0;
17-
box-shadow: 0 0 5px rgba(0,0,0,0.3);
18-
margin: 5px;
14+
width: 22vw;
15+
height: 38vh;
16+
background:white;
17+
margin: 1% 1%;
1918
border-radius: 5px;
2019
color: #606f7b;
2120
align-items: center;
@@ -33,6 +32,7 @@ $button-blue: #24BCFF; */
3332

3433
.projectContainer{
3534
display: flex;
35+
flex-direction: column-reverse;
3636
flex-flow: row wrap;
3737
height: 600px;
3838
overflow-y: scroll;
@@ -116,4 +116,4 @@ h1 {
116116
align-items: center;
117117
justify-content: center;
118118
width: 100%;
119-
} */
119+
} */

app/src/tutorial/Canvas.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React from 'react';
33
//images
44
import canvas1 from '../../../resources/canvas_tutorial_images/canvas1.png';
55
import drag1 from '../../../resources/canvas_tutorial_images/drag1.png';
6+
import undoRedo from '../../../resources/canvas_tutorial_images/undoRedo.gif';
67

78
const Canvas: React.FC<{
89
classes: any;
@@ -29,6 +30,12 @@ const Canvas: React.FC<{
2930
<p className={classes.text}>Select a <span className={classes.notLink} onClick={() => setPage('Reusable_Components')} >reusable component</span>, click and hold to drag on to a page.<br/>
3031
Drag the selected item on to the center canvas.</p>
3132
<hr/>
33+
<h1 className={classes.title}>Undo and Redo</h1>
34+
<p className={classes.text}> The undo functionality is implemented to revert the user's last action. Redo will reperform the user's last undid action.
35+
</p>
36+
<div className={classes.imgWrapper}>
37+
<img src={undoRedo}/>
38+
</div>
3239
<h1 className={classes.title}>Keyboard Shortcuts</h1>
3340
<h2 className={classes.text}>Mac</h2>
3441
<ul className={classes.text}>
629 KB
Loading

0 commit comments

Comments
 (0)