From 48d244b571e77d4af684c1515c3f39339f985f6f Mon Sep 17 00:00:00 2001
From: d_yanis <dahmane.yanis.2004@gmail.com>
Date: Tue, 5 Dec 2023 17:31:31 +0100
Subject: [PATCH] WIP page home

---
 front/style/home/global.css              |  5 +++++
 front/style/home/tactic.css              | 10 ++++++++++
 front/style/{home.css => home/titre.css} |  7 +++++++
 front/views/Home.tsx                     |  2 +-
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 front/style/home/global.css
 create mode 100644 front/style/home/tactic.css
 rename front/style/{home.css => home/titre.css} (90%)

diff --git a/front/style/home/global.css b/front/style/home/global.css
new file mode 100644
index 0000000..f215ab7
--- /dev/null
+++ b/front/style/home/global.css
@@ -0,0 +1,5 @@
+#main {
+    margin-left:10%;
+    margin-right:10%;
+    background-color: grey;
+}
\ No newline at end of file
diff --git a/front/style/home/tactic.css b/front/style/home/tactic.css
new file mode 100644
index 0000000..7dea75e
--- /dev/null
+++ b/front/style/home/tactic.css
@@ -0,0 +1,10 @@
+#titreTactic {
+    background-color: red;
+    padding-right : 10px;
+    margin-top : 10px;
+}
+
+#titreTactic h2 {
+    display: inline;
+    padding-right : 25px;
+}
\ No newline at end of file
diff --git a/front/style/home.css b/front/style/home/titre.css
similarity index 90%
rename from front/style/home.css
rename to front/style/home/titre.css
index e4358ff..ccc7326 100644
--- a/front/style/home.css
+++ b/front/style/home/titre.css
@@ -14,6 +14,7 @@
 
 #header { 
     text-align: center;
+<<<<<<< HEAD:front/style/home.css
     background-color: green;
     margin : 0px;
 }
@@ -84,4 +85,10 @@ td {
 td:hover {
     background-color: red;
 
+=======
+}
+
+#title {
+    background-color: aqua;
+>>>>>>> 6d36115 (WIP page home):front/style/home/titre.css
 }
\ No newline at end of file
diff --git a/front/views/Home.tsx b/front/views/Home.tsx
index 4792f5f..9ddb840 100644
--- a/front/views/Home.tsx
+++ b/front/views/Home.tsx
@@ -139,5 +139,5 @@ export function Tactic({lastTactics} : { lastTactics : Tactic[]}) {
                 {listTactic}
             </ul>
         </div>
-    )
+    );
 }
\ No newline at end of file