conflicts merged

Dev-tanay · Jun 6, 2024 · a751eb9 · a751eb9
1 parent d469000
commit a751eb9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/index.html b/index.html
@@ -6,13 +6,22 @@
   <title>Rubik Cube</title>
   <link rel="icon" type="image/x-icon" href="images\icon.png">
   <meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0"><link rel="stylesheet" href="./style.css">
+<<<<<<< Updated upstream
     <!--Link form FontAwesome for volume icon, info icon, left arrow icon-->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
 
 </head>
 <body>
   <header class="ui__header header"> <!-- Added "header" class -->
     <a href="./AboutUs/About.html" class="btn--about"><i class="btn btn--in fa-solid fa-circle-info"></i></a>
+=======
+  <!--Fontawesome for Volume, info, left arrow icon-->
+  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
+</head>
+<body>
+  <header class="ui__header header"> <!-- Added "header" class -->
+    <a href="about.html" class="btn--about"><i class="btn btn--in fa-solid fa-circle-info"></i></a>
+>>>>>>> Stashed changes
   </header>
   <!-- separate div element for the goggle sign-in/log-in element -->
   <!-- g_id_onload is for automatic loading of the Google Identity Services. -->

diff --git 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 */
-}
+}
+=======
+
+>>>>>>> Stashed changes