Merge branch 'main' of https://github.com/bdngeorge/itws-term-project

bdngeorge · Dec 5, 2021 · 9ecdb98 · 9ecdb98
2 parents 0792e71 + 283ad65
commit 9ecdb98
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+
+includes/dbconnect.inc.php
diff --git a/account/login.php b/account/login.php
@@ -48,7 +48,7 @@
 
   </head>
   <body>
-    <?php include("../includes/header2.inc.php"); ?>
+    <?php include("../includes/header.inc.php"); ?>
 
     <section class="center-items center-self body">
       <h2 class="bold">Login</h2>

diff --git a/includes/dbconnect.inc.php b/includes/dbconnect.inc.php
@@ -3,7 +3,7 @@
 
   $dbhost = 'localhost';
   $dbuser = 'root';
-  $dbpassword = '';
+  $dbpassword = 'root';
   $dbname = 'textbook_buddy';
 
   @ $db = new mysqli($dbhost, $dbuser, $dbpassword, $dbname);

diff --git a/includes/header.inc.php b/includes/header.inc.php
@@ -1,8 +1,10 @@
 <header>
   <a href="../"> <h1 class="logo left">  Textbook Buddy </h1> </a>
-  <ul class="hmenu right">
-    <a href="catalog.php"><li>Catalog</li></a>
-    <a href="uploadBooks.php"><li>Sell</li></a> 
-    <a href="../account/account.php"><li>Account</li></a>
+  <ul class="hmenu">
+    <div>
+      <a href="catalog.php"><li>Catalog</li></a>
+      <a href="uploadBooks.php"><li>Sell</li></a> 
+      <a href="../account/account.php"><li>Account</li></a>
+    </div>
   </ul>
 </header>
diff --git a/styles/general.css b/styles/general.css
@@ -17,21 +17,21 @@ COLOR PALETTE -- CSS HEX
 }
 
 header {
-  font-variant: small-caps;
-  height: 75px;
+	font-variant: small-caps;
+  height: 3.5vw;
+  display: flex;
   font-weight: bold;
+  border: 4px solid rgba(241, 239, 239, 0.555); 
+  background-color: rgba(241, 239, 239, 0.555);
   color: black;
   align-items: center;
   justify-content: space-between;
-  border: 4px solid rgba(241, 239, 239, 0.555); 
-  background-color: rgba(241, 239, 239, 0.555);
 }
 
 header h1 {
   font-size: 40px;
-  position: absolute;
+  padding: 0 0 0 20px;
   color: black;
-  padding: 0 0 0 1vw;
 }
 
 header a {
@@ -70,30 +70,21 @@ header a {
   justify-content: center;
 }
 
-/*  header menu items */
-.logo {
-  float:left;
-  padding: 25px 0 5px 20px;
-  color: #449fee;
-}
-
 .hmenu {
-  text-align: center;
-  float: right;
-  position: absolute;
-  top: 6px;
-  right: 10px;
+	text-align: center;
+  display: flex;
 }
 .hmenu a {
   color: black;
-  text-decoration: none;
-  padding: 0 3px 0 3px;
+	text-decoration: none;
+  padding: 0 2.5vw 0 2.5vw;
 }
-
 .hmenu li {
+  font-size: 1vw;
   background-color: rgb(179, 177, 177);
-  border-radius: 10px;
-  padding: 0 5px 0 5px;
+  border-radius: 25%;
   display: inline-block;
-  list-style: none;
+  width: 8vw;
+  height: 1.5vw;
+	list-style: none;
 }