resolve merge conflicts

silvankammermann · Oct 28, 2023 · a51e9a4 · a51e9a4
2 parents e196d92 + 726edd0
commit a51e9a4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/frontend/src/app/atomics.css b/frontend/src/app/atomics.css
@@ -62,4 +62,16 @@
 
 .centeredText {
   text-align: center;
+}
+
+/* ***** Border radius */
+
+.circle {
+  border: 0;
+  padding: 0.5rem;
+  border-radius: 100%;
+  aspect-ratio: 1 / 1;
+  height: 3em;
+  width: 3em;
+  margin: 0 .5em;
 }
diff --git a/frontend/src/app/components/TinderSwiper/TinderSwiper.js b/frontend/src/app/components/TinderSwiper/TinderSwiper.js
@@ -7,21 +7,14 @@ import TinderCard from "react-tinder-card";
 const TinderSwiper = ({ taksId, taskName }) => {
   return (
     <>
-      <div className={styles.cardStack}>
-        <TinderCard key="1" className={styles.card}>
-          <div className={styles.container}>
-            <span className="h1">{taskName}</span>
-          </div>
-        </TinderCard>
-        <TinderCard key="2" className={styles.card}>
-          <div className={styles.container}>
-            <span className="h1">{taskName}</span>
-          </div>
-        </TinderCard>
-      </div>
-      <div>
-        <button>LEFT</button>
-        <button>RIGHT</button>
+      <TinderCard>
+        <div className={styles.container}>
+          <span className="h1">{taskName}</span>
+        </div>
+      </TinderCard>
+      <div className={styles.decissionTriggers}>
+        <button className="h2 circle bgRed colorWhite">Later</button>
+        <button className="h2 circle bgGreen colorWhite">Yes!</button>
       </div>
     </>
   );

diff --git a/frontend/src/app/components/TinderSwiper/TinderSwiper.module.css b/frontend/src/app/components/TinderSwiper/TinderSwiper.module.css
@@ -38,3 +38,8 @@
 .card:nth-child(odd) .container {
   transform: rotate(-3deg);
 }
+
+.decissionTriggers {
+  text-align: center;
+  transform: translateY(-1em);
+}