From efaa32cd6824789450d6f9de9ab42eb8114ce9a6 Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Tue, 13 Jun 2023 16:24:01 +0100 Subject: [PATCH] Completed the rest of the Selection screen to the new design --- src/components/Low/Button.tsx | 24 +++++++--- src/exams/Selection.tsx | 85 ++++++++++++++++++++++++++++++++++- tailwind.config.js | 1 + 3 files changed, 103 insertions(+), 7 deletions(-) diff --git a/src/components/Low/Button.tsx b/src/components/Low/Button.tsx index 7c2682dd..337641d8 100644 --- a/src/components/Low/Button.tsx +++ b/src/components/Low/Button.tsx @@ -11,19 +11,31 @@ interface Props { } export default function Button({color = "green", variant = "solid", disabled = false, className, children, onClick}: Props) { - const colorClassNames: {[key in typeof color]: string} = { - green: "bg-mti-green-light hover:bg-mti-green disabled:text-mti-green disabled:bg-mti-green-ultralight selection:bg-mti-green-dark", - blue: "bg-mti-blue-light hover:bg-mti-blue disabled:text-mti-blue disabled:bg-mti-blue-ultralight selection:bg-mti-blue-dark", - orange: "bg-mti-orange-light hover:bg-mti-orange disabled:text-mti-orange disabled:bg-mti-orange-ultralight selection:bg-mti-orange-dark", + const colorClassNames: {[key in typeof color]: {[key in typeof variant]: string}} = { + green: { + solid: "bg-mti-green-light text-white hover:bg-mti-green disabled:text-mti-green disabled:bg-mti-green-ultralight selection:bg-mti-green-dark", + outline: + "bg-transparent text-mti-green-light border border-mti-green-light hover:bg-mti-green-light disabled:text-mti-green disabled:bg-mti-green-ultralight selection:bg-mti-green-dark hover:text-white selection:text-white", + }, + blue: { + solid: "bg-mti-blue-light text-white hover:bg-mti-blue disabled:text-mti-blue disabled:bg-mti-blue-ultralight selection:bg-mti-blue-dark", + outline: + "bg-transparent text-mti-blue-light border border-mti-blue-light hover:bg-mti-blue-light disabled:text-mti-blue disabled:bg-mti-blue-ultralight selection:bg-mti-blue-dark hover:text-white selection:text-white", + }, + orange: { + solid: "bg-mti-orange-light text-white hover:bg-mti-orange disabled:text-mti-orange disabled:bg-mti-orange-ultralight selection:bg-mti-orange-dark", + outline: + "bg-transparent text-mti-orange-light border border-mti-orange-light hover:bg-mti-orange-light disabled:text-mti-orange disabled:bg-mti-orange-ultralight selection:bg-mti-orange-dark hover:text-white selection:text-white", + }, }; return ( + +
+
+ +
+ Listening: +

+ Improve your ability to follow conversations in English and your ability to understand different accents and intonations. +

+ +
+
+
+ +
+ Writing: +

+ Allow you to practice writing in a variety of formats, from simple paragraphs to complex essays. +

+ +
+
+
+ +
+ Speaking: +

+ You'll have access to interactive dialogs, pronunciation exercises and speech recordings. +

+ +
+ ); diff --git a/tailwind.config.js b/tailwind.config.js index 573f85dc..ea4551a4 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -8,6 +8,7 @@ module.exports = { orange: {DEFAULT: "#FF6000", dark: "#cc4402", light: "#ff790a", ultralight: "#ffdaa5"}, green: {DEFAULT: "#307912", dark: "#2a6014", light: "#3d9f11", ultralight: "#c6edaf"}, blue: {DEFAULT: "#0696ff", dark: "#007ff8", light: "#1eb3ff", ultralight: "#b5edff"}, + white: {DEFAULT: "#ffffff", alt: "#FDFDFD"}, gray: { seasalt: "#F9F9F9", smoke: "#F5F5F5",