From e9d18209f2304b91c82a6d4e0c611de042fa6c45 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Mon, 31 Jan 2022 23:16:28 -0500 Subject: [PATCH 1/6] exerciseSide commit test --- src/components/shared/ExerciseSide.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx index b553f43..6b1e0cc 100644 --- a/src/components/shared/ExerciseSide.tsx +++ b/src/components/shared/ExerciseSide.tsx @@ -1,7 +1,13 @@ import '../../styles/ExerciseSide.scss'; function ExerciseSide(): JSX.Element { - return
; + + return (
+

Type the correct numbers into the blanks below!

+ + +
+ ); } export default ExerciseSide; From 9608b3de0de7981ee951f244ea3a92800d10bcc7 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Fri, 25 Feb 2022 16:30:58 -0800 Subject: [PATCH 2/6] New Push 2/25/22 --- src/components/shared/ExerciseSide.tsx | 21 +++++++++++++++------ src/styles/ExerciseSide.scss | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx index 6b1e0cc..32a5253 100644 --- a/src/components/shared/ExerciseSide.tsx +++ b/src/components/shared/ExerciseSide.tsx @@ -1,13 +1,22 @@ import '../../styles/ExerciseSide.scss'; function ExerciseSide(): JSX.Element { - - return (
-

Type the correct numbers into the blanks below!

- + return ( +
+
+ +

Type the correct numbers into the blanks below!

+

A = (2,0)

+

B = (-2,0)

+

C = (-1,0)

-
- ); + + + + +
+ ) } + export default ExerciseSide; diff --git a/src/styles/ExerciseSide.scss b/src/styles/ExerciseSide.scss index 514ec2b..b78a2cf 100644 --- a/src/styles/ExerciseSide.scss +++ b/src/styles/ExerciseSide.scss @@ -1,7 +1,28 @@ @use '_colors.scss' as colors; + +body { + font-family: "Quattrocento Sans", sans-serif; +} + #exercise-side-container { background-color: colors.$bg-white; flex-grow: 1; height: 100%; + + level { + color: white; + font-size: 1.875rem; + padding: 10px 10px; + margin-left: 10px; + } + + button { + color: white; + //padding: 3px 10px; + font-size: 1.5rem; + border-radius: 10px; + border: 1px solid #e1e4e8; + background-color: green; + } } From eeee08394612e61a04057aacf1fbfa801068e586 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Fri, 25 Feb 2022 16:31:41 -0800 Subject: [PATCH 3/6] New Push 2/25/22 --- src/components/shared/ExerciseSide.tsx | 18 +++++++++--------- src/styles/ExerciseSide.scss | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx index 32a5253..8057b72 100644 --- a/src/components/shared/ExerciseSide.tsx +++ b/src/components/shared/ExerciseSide.tsx @@ -4,18 +4,18 @@ function ExerciseSide(): JSX.Element { return (
- -

Type the correct numbers into the blanks below!

-

A = (2,0)

-

B = (-2,0)

-

C = (-1,0)

-
- - +

Type the correct numbers into the blanks below!

+

A = (2,0)

+

B = (-2,0)

+

C = (-1,0)

+ + + +
- ) + ); } diff --git a/src/styles/ExerciseSide.scss b/src/styles/ExerciseSide.scss index b78a2cf..f437aae 100644 --- a/src/styles/ExerciseSide.scss +++ b/src/styles/ExerciseSide.scss @@ -13,16 +13,16 @@ body { level { color: white; font-size: 1.875rem; - padding: 10px 10px; margin-left: 10px; + padding: 10px; } button { + background-color: green; + border: 1px solid #e1e4e8; + border-radius: 10px; color: white; //padding: 3px 10px; font-size: 1.5rem; - border-radius: 10px; - border: 1px solid #e1e4e8; - background-color: green; } } From 5a41e7e731f1353232172c39af9647065dd2c9b8 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Mon, 7 Mar 2022 15:13:46 -0800 Subject: [PATCH 4/6] added the styling and text to the Exercise Side --- src/styles/ExerciseSide.scss | 5 +++-- tsconfig.json | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/styles/ExerciseSide.scss b/src/styles/ExerciseSide.scss index f437aae..7f430cb 100644 --- a/src/styles/ExerciseSide.scss +++ b/src/styles/ExerciseSide.scss @@ -13,8 +13,8 @@ body { level { color: white; font-size: 1.875rem; - margin-left: 10px; padding: 10px; + justify-content: center; } button { @@ -22,7 +22,8 @@ body { border: 1px solid #e1e4e8; border-radius: 10px; color: white; - //padding: 3px 10px; font-size: 1.5rem; + justify-content: center; } + } diff --git a/tsconfig.json b/tsconfig.json index 8c87f14..c8c5b24 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,3 +22,4 @@ }, "include": ["**/*.ts", "**/*.tsx"] } + From d75747efa8964720f8af4ad47ad85525453fe239 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Fri, 6 May 2022 15:51:18 -0700 Subject: [PATCH 5/6] Finished parts 2 and 3 of the Exercise Side ticket --- src/components/shared/ExerciseSide.tsx | 7 +++++-- src/styles/ExerciseSide.scss | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx index 8057b72..352a9d4 100644 --- a/src/components/shared/ExerciseSide.tsx +++ b/src/components/shared/ExerciseSide.tsx @@ -1,9 +1,11 @@ + import '../../styles/ExerciseSide.scss'; +// import AxisExercise from './Exercises/AxisExercise'; // from Arush's code function ExerciseSide(): JSX.Element { return (
-
+

Type the correct numbers into the blanks below!

A = (2,0)

@@ -12,6 +14,7 @@ function ExerciseSide(): JSX.Element {
+
@@ -19,4 +22,4 @@ function ExerciseSide(): JSX.Element { } -export default ExerciseSide; +export default ExerciseSide; \ No newline at end of file diff --git a/src/styles/ExerciseSide.scss b/src/styles/ExerciseSide.scss index 7f430cb..9050867 100644 --- a/src/styles/ExerciseSide.scss +++ b/src/styles/ExerciseSide.scss @@ -13,8 +13,8 @@ body { level { color: white; font-size: 1.875rem; - padding: 10px; justify-content: center; + padding: 10px; } button { @@ -27,3 +27,11 @@ body { } } + +.exercise-box { +align-items: center; +display: flex; +height: 85%; +justify-content: center; +width: 100%; +} \ No newline at end of file From 546c2e305b8850bc2029e462368998ff928f3c16 Mon Sep 17 00:00:00 2001 From: Abishan Sutharshan Date: Fri, 6 May 2022 15:54:13 -0700 Subject: [PATCH 6/6] Finished parts 2 and 3 of the Exercise Side ticket --- src/components/shared/ExerciseSide.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx index 352a9d4..e81603c 100644 --- a/src/components/shared/ExerciseSide.tsx +++ b/src/components/shared/ExerciseSide.tsx @@ -14,7 +14,7 @@ function ExerciseSide(): JSX.Element { - +