From 798c9bf6c5ffed14da2d8fdfa7f14c59d13deb18 Mon Sep 17 00:00:00 2001 From: Sylvia Blaho Date: Wed, 7 Aug 2024 22:18:12 +0000 Subject: [PATCH] move Rounded CSS to App styles #101 --- src/App.module.css | 13 +++++++++++++ src/pages/tasks/Task.js | 9 +++++---- src/styles/Task.module.css | 18 ------------------ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/App.module.css b/src/App.module.css index 8ddb469..8b82700 100644 --- a/src/App.module.css +++ b/src/App.module.css @@ -85,3 +85,16 @@ figure { .Rounded { border-radius: 20px; } + +.RoundedTop { + border-radius: 20px 20px 0px 0px !important; +} + +/* rounded corners on smaller objects */ +.LittleRounded { + border-radius: 10px; +} + +.LittleRoundedBottom { + border-radius: 0px 0px 10px 10px; +} diff --git a/src/pages/tasks/Task.js b/src/pages/tasks/Task.js index a7a8f4b..a8efe4f 100644 --- a/src/pages/tasks/Task.js +++ b/src/pages/tasks/Task.js @@ -14,6 +14,7 @@ import { axiosRes } from "../../api/axiosDefaults"; import Avatar from "../../components/Avatar"; import { useCurrentUser } from "../../contexts/CurrentUserContext"; import styles from "../../styles/Task.module.css"; +import appStyles from "../../App.module.css"; import { MoreDropdown } from "../../components/MoreDropdown"; import { ListGroupItem } from "react-bootstrap"; @@ -111,12 +112,12 @@ const Task = (props) => { return ( { } // only round top on TaskDetail page ${taskDetail - ? styles.LittleRounded - : styles.LittleRoundedBottom + ? appStyles.LittleRounded + : appStyles.LittleRoundedBottom } // set background color depending on task priority ${ diff --git a/src/styles/Task.module.css b/src/styles/Task.module.css index 325ff58..29bd26c 100644 --- a/src/styles/Task.module.css +++ b/src/styles/Task.module.css @@ -20,24 +20,6 @@ --white: #FFFFFF; } -/* rounded corners on bigger objects */ -.Rounded { - border-radius: 20px; -} - -.RoundedTop { - border-radius: 20px 20px 0px 0px !important; -} - -/* rounded corners on smaller objects */ -.LittleRounded { - border-radius: 10px; -} - -.LittleRoundedBottom { - border-radius: 0px 0px 10px 10px; -} - .Task { background-color: #ffffff; border: 1px solid #dadadf;