Skip to content

Commit

Permalink
move Rounded CSS to App styles #101
Browse files Browse the repository at this point in the history
  • Loading branch information
blahosyl committed Aug 7, 2024
1 parent afd293e commit 798c9bf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 22 deletions.
13 changes: 13 additions & 0 deletions src/App.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
9 changes: 5 additions & 4 deletions src/pages/tasks/Task.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -111,12 +112,12 @@ const Task = (props) => {
return (
<Card
className={`${styles.Task}
${styles.Rounded}
${appStyles.Rounded}
`}
>
<Card.Header
className={`
${styles.RoundedTop}
${appStyles.RoundedTop}
// set background color depending on task priority
${
priority === String("LOW")
Expand Down Expand Up @@ -307,8 +308,8 @@ const Task = (props) => {
}
// only round top on TaskDetail page
${taskDetail
? styles.LittleRounded
: styles.LittleRoundedBottom
? appStyles.LittleRounded
: appStyles.LittleRoundedBottom
}
// set background color depending on task priority
${
Expand Down
18 changes: 0 additions & 18 deletions src/styles/Task.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 798c9bf

Please sign in to comment.