From c936777c2aa18b76a7e1eca23bf1932990bc10e4 Mon Sep 17 00:00:00 2001
From: Mit Gajera <144581159+mitgajera@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:15:03 +0000
Subject: [PATCH] fixes some styles

---
 style.css | 144 ++++++++++++++++++++++++++----------------------------
 1 file changed, 69 insertions(+), 75 deletions(-)

diff --git a/style.css b/style.css
index 4417913..bedf4f5 100644
--- a/style.css
+++ b/style.css
@@ -1,77 +1,4 @@
-<<<<<<< HEAD
-* {
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: blanchedalmond;
-    font-family: "Poppins", sans-serif;
-    font-weight: 100;
-    font-style: normal;
-}
-
-h1{
-    text-align: center;
-    margin-top: 150px;
-    margin-right: 30px;
-}
-
-.container{
-    height: 60vh;
-    display: flex;
-    text-align: center;
-    justify-content: center;
-    margin-top: 55px;
-    
-}
-
-.game{
-    height: 40vmin;
-    width: 50vmin;
-    display: flex;
-    flex-wrap: wrap;
-    gap: 5px;
-}
-
-.box{
-    height: 15vmin;
-    width: 15vmin;
-    border-radius: 5px;
-    border: none;
-    background-color: rgb(255, 215, 146);
-    box-shadow: 0 0 5px rgba(0,0,0,0.3);
-    font-size: 45px;
-    color:red;
-}
-
-.reset{
-    display: flex;
-    justify-content: center;
-    margin-top: -50px;
-    margin-left: -30px;
-}
-
-.reset #reset-btn{
-    padding: 7px 20px;
-    border-radius: 5px;
-    border: none;
-    font-size: 15px;
-    cursor: pointer;
-    color: white;;
-    background-color: rgb(219, 186, 129)
-}
-
-.reset #ng-btn{
-    padding: 8px 20px;
-    border-radius: 5px;
-    border: none;
-    font-size: 15px;
-    cursor: pointer;
-    color: white;
-    margin-left: 15px;
-    background-color: rgb(0, 0, 0)
-=======
+
 * {
     margin: 0;
     padding: 0;
@@ -84,6 +11,74 @@ body {
     font-style: normal;
 }
 
+h1{
+    text-align: center;
+    margin-top: 150px;
+    margin-right: 30px;
+}
+
+.container{
+    height: 60vh;
+    display: flex;
+    text-align: center;
+    justify-content: center;
+    margin-top: 55px;
+    
+}
+
+.game{
+    height: 40vmin;
+    width: 50vmin;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 5px;
+}
+
+.box{
+    height: 15vmin;
+    width: 15vmin;
+    border-radius: 5px;
+    border: none;
+    background-color: rgb(255, 215, 146);
+    box-shadow: 0 0 5px rgba(0,0,0,0.3);
+    font-size: 45px;
+    color:red;
+}
+
+.reset{
+    display: flex;
+    justify-content: center;
+    margin-top: -50px;
+    margin-left: -30px;
+}
+
+.reset #reset-btn{
+    padding: 7px 20px;
+    border-radius: 5px;
+    border: none;
+    font-size: 15px;
+    cursor: pointer;
+    color: white;;
+    background-color: rgb(219, 186, 129)
+}
+
+.reset #ng-btn{
+    padding: 8px 20px;
+    border-radius: 5px;
+    border: none;
+    font-size: 15px;
+    cursor: pointer;
+    color: white;
+    margin-left: 15px;
+    background-color: rgb(0, 0, 0);
+
+body {
+    background-color: blanchedalmond;
+    font-family: "Poppins", sans-serif;
+    font-weight: 100;
+    font-style: normal;
+}
+
 h1 {
     text-align: center;
     margin-top: 150px;
@@ -240,5 +235,4 @@ h1 {
         justify-content: center;
         margin-left: 5px;
     }
->>>>>>> b352cd0 ("Updated CSS styling for various elements, including h1, container, game, box, and reset, with added media queries for responsive design.")
 }
\ No newline at end of file