From 3e1132cbf3aede84cfacd9529f95b66a6be6ad0e Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:02:35 +0530 Subject: [PATCH 01/10] Update index.html --- index.html | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index bf51bfc..4f82943 100644 --- a/index.html +++ b/index.html @@ -1,17 +1,37 @@ - - - - - - - - Super Wars - - + + + +
+
+
+
+

Spiderman

+

12

+
+
+
+

Wonder Woman

+

30

+
+
+
+

5-0

+
+
+
+
+

Captain America

+

50

+
+
+
+

Gem Woman

+

12

+
+
+
- - From 822c49191732e3a2ad70e3dcfeb7a6408cdc64d2 Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:03:13 +0530 Subject: [PATCH 02/10] Update style.css --- style.css | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/style.css b/style.css index e31018b..70a7b92 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,30 @@ +.grid-container { + display: grid; + grid-template-columns: auto auto auto; + padding: 10px; + margin: 10%; + margin-top: 0%; +} + +.grid-item { + background-color: rgb(255, 255, 255); + padding: 20px; + font-size: 30px; + text-align: center; +} + +.grid-item1 { + display: inline-grid; + justify-content: space-evenly; + background-color: rgb(255, 255, 255); + + box-shadow:2px 5px 10px rgba(68, 67, 67, 0.795); + border-radius: 15px; + padding: 20px; + font-size: 20px; + text-align: center; + line-height: 5px; +} .footer{ margin-left : 80px; font-size : 18px; -} From b71283c1648c62f463eef097b7ce9b056aa2c82e Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:12:48 +0530 Subject: [PATCH 03/10] Update style.css --- style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/style.css b/style.css index 70a7b92..0b05c28 100644 --- a/style.css +++ b/style.css @@ -1,3 +1,4 @@ +@@ -1,3 +1,30 @@ .grid-container { display: grid; grid-template-columns: auto auto auto; From b1f9de3487d06b78feb4ff277da6c838aba6f1c7 Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:14:02 +0530 Subject: [PATCH 04/10] Update index.html --- index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/index.html b/index.html index 4f82943..f88c8ea 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,8 @@ +\@@ -10,7 +10,35 @@ - -
From 248c2c79184a4d8a7f9b3931e993b6113c3bffeb Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:15:18 +0530 Subject: [PATCH 05/10] Update index.html --- index.html | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index f88c8ea..6d9fa07 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,9 @@ -\@@ -10,7 +10,35 @@ +@@ -10,6 +10,8 @@ +
@@ -26,11 +27,3 @@

5-0

50

-
-

Gem Woman

-

12

-
-
-
-
Made with by ProGrad
- From e66b47b759182fee0cbb0f29db00bbaffbc102fb Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:17:44 +0530 Subject: [PATCH 06/10] Update index.html --- index.html | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 6d9fa07..0e63a15 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,17 @@ -@@ -10,6 +10,8 @@ +@@ -1,16 +1,46 @@ + + + + + + + Super Wars + +
@@ -27,3 +36,13 @@

5-0

50

+
+

Gem Woman

+

12

+
+
+
+
Made with by ProGrad
+ + + From 540daaa78f11afb76e25c21bf4726db500b69194 Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:18:20 +0530 Subject: [PATCH 07/10] Update style.css --- style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/style.css b/style.css index 0b05c28..44591af 100644 --- a/style.css +++ b/style.css @@ -29,3 +29,4 @@ .footer{ margin-left : 80px; font-size : 18px; +} From a75a462f9199902412465eeff902f39449831938 Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:18:39 +0530 Subject: [PATCH 08/10] Update style.css --- style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/style.css b/style.css index 44591af..42c4cc3 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,3 @@ -@@ -1,3 +1,30 @@ .grid-container { display: grid; grid-template-columns: auto auto auto; From 4e83268b887e8f9d76323759f4a0fa99d0bb022c Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:19:44 +0530 Subject: [PATCH 09/10] Update index.html --- index.html | 67 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/index.html b/index.html index 0e63a15..523c00d 100644 --- a/index.html +++ b/index.html @@ -1,48 +1,59 @@ -@@ -1,16 +1,46 @@ + - Super Wars + SuperWars-Stage1 - - -
-
-
-
+ +
+
+
+

Spiderman

-

12

+

12

-
-
-

Wonder Woman

-

30

+ + + +
+ +

Wonder
Woman

+

30

-
-

5-0

+ + +
+

5 - 0

-
-
-
-

Captain America

-

50

+ + + +
+
+ +

Captain
America

+

50

-
-
-

Gem Woman

-

12

+ + +
+ +

Gem
Woman

+

12

+
-
-
Made with by ProGrad
- - +
+ + + + From 5816517d3301cca84779532c2126cf187cb7045f Mon Sep 17 00:00:00 2001 From: manyatiwari799 <104717674+manyatiwari799@users.noreply.github.com> Date: Sun, 15 May 2022 14:20:21 +0530 Subject: [PATCH 10/10] Update style.css --- style.css | 56 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/style.css b/style.css index 42c4cc3..01778d0 100644 --- a/style.css +++ b/style.css @@ -1,31 +1,43 @@ -.grid-container { +.footer{ + display:flex; + flex-direction: row; + align-content: flex-end; + position: relative; + top: 650px; + margin-left: 20px; + font-size: 20px; + font-family:sans-serif; + font-style: normal; + + +} +.main{ display: grid; - grid-template-columns: auto auto auto; - padding: 10px; - margin: 10%; - margin-top: 0%; + grid-template-columns: 1fr 1fr 1fr; } -.grid-item { - background-color: rgb(255, 255, 255); - padding: 20px; - font-size: 30px; - text-align: center; + +.hero{ + display: grid; + grid-template-columns: 1fr 1fr; + margin-left: 250px; + border-color: li; } -.grid-item1 { - display: inline-grid; - justify-content: space-evenly; - background-color: rgb(255, 255, 255); +.villains{ + display: grid; + grid-template-columns: 1fr 1fr; + margin-right: 150px; +} - box-shadow:2px 5px 10px rgba(68, 67, 67, 0.795); - border-radius: 15px; - padding: 20px; - font-size: 20px; +.score{ text-align: center; - line-height: 5px; } -.footer{ - margin-left : 80px; - font-size : 18px; + +#container{ + width: 200px; + height: 300px; + border: 3px solid lightgray; + margin-right: 20px; + text-align: center; }