From a751eb97b1c049e3bbe0a0de78e3e95e0ce02e42 Mon Sep 17 00:00:00 2001 From: "Surya.R" <134582726+imsuryya@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:09:53 +0530 Subject: [PATCH] conflicts merged --- index.html | 9 +++++++++ style.css | 29 ++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index b1f7bf0..47b6304 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ Rubik Cube +<<<<<<< Updated upstream @@ -13,6 +14,14 @@
+======= + + + + +
+ +>>>>>>> Stashed changes
diff --git a/style.css b/style.css index b003b8a..92135d5 100644 --- a/style.css +++ b/style.css @@ -281,7 +281,11 @@ body { /*The back button was changed to bottom because it interrupts the info button.*/ .btn--tl { bottom: 1.2em; +<<<<<<< Updated upstream left: 1.2em; +======= + left: 1.2em; +>>>>>>> Stashed changes } .btn--bl { bottom: 1.2em; @@ -302,12 +306,31 @@ body { opacity: 1; pointer-events: auto; } +<<<<<<< Updated upstream +======= +/* For info button */ +>>>>>>> Stashed changes .btn--in{ top: 1.2em; left: 1.2em; opacity: 1; pointer-events: auto; } +<<<<<<< Updated upstream +======= +.btn--about { + position: relative; + z-index: 10; /* Ensure it's on top */ +} +.header { + display: flex; + justify-content: space-between; + align-items: center; + padding: 5px 5px; + color: #333; + z-index: 10; +} +>>>>>>> Stashed changes .btn svg { display: block; } @@ -374,6 +397,7 @@ body { .g_id_signin { margin-top: 20px; } +<<<<<<< Updated upstream .header { display: flex; justify-content: space-between; @@ -386,4 +410,7 @@ body { .btn--about { position: relative; z-index: 10; /* Ensure it's on top */ -} \ No newline at end of file +} +======= + +>>>>>>> Stashed changes