diff --git a/css/default_style.css b/css/default_style.css
index 8fa38f7350f9335af79cc18d24e065b42f7d5f27..c1069da115733e2411c09631b250be0b5dfa73a7 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -1,5 +1,8 @@
.frame {
+ width: 600px;
margin: 50px auto;
+ border-left: 0.5px solid black;
+ border-right: 0.5px solid black;
}
.frame h1,h2 {
@@ -40,5 +43,12 @@ a:link, a:visited {
}
a:hover {
- opacity: 0.5;
+ opacity: 0.6%;
}
+
+.menu {
+ border: 0.5px solid black;
+ width: 199px;
+ float: left;
+}
+>>>>>>> 01a42af14bd276e36413854851437430e627c9b8
diff --git a/css/header.css b/css/header.css
index 599ff653f18f9c6c49bd82d158f878e8dfc8895c..1dda58a6ce2764f149dc6de7689df76414fe4512 100644
--- a/css/header.css
+++ b/css/header.css
@@ -1,6 +1,6 @@
.header {
border-bottom-style: solid;
- height: 10%;
+ height: 55px;
}
.logo {
float: left;
@@ -24,8 +24,8 @@
margin: 0 ;
margin-top: 10px;
}
-.menu {
+/*.menu {
text-align: center;
background-color: rgb(65,62,119);
height: 20px;
-}
+}*/
diff --git a/css/profile.css b/css/profile.css
index 6a9f6e1f6e04400b8080d93855678546c6b5ab34..0937b7365a2b1ffca3a633682b2f2c4354164af6 100755
--- a/css/profile.css
+++ b/css/profile.css
@@ -1,7 +1,3 @@
-#profile_frame {
- height: 550px;
- width: 400px;
-}
#profile_frame h1 {
text-align: left;
margin-top: 0;
@@ -94,3 +90,6 @@ input.upload_file {
height: 17px;
width: 100px;
}
+#profile_link {
+ background-color: #465d43;
+}
\ No newline at end of file
diff --git a/main.html b/main.html
index dc2d71b3f0d2b131ef175e3041e3aa6c27e9f92d..eaf8598a93af356f0ffa7f96fd23c2f1e685c084 100644
--- a/main.html
+++ b/main.html
@@ -13,9 +13,9 @@
</div>
<div style="background-color: white; max-width: 600px; margin-left: auto; margin-right: auto">
<a href="order/order.php" name="order_link">
- <div style="background-color: red; width: 200px; float: left">
- <h2>Order</h2>
- </div>
+ <div style="background-color: red; width: 200px; float: left">
+ <h2>Order</h2>
+ </div>
</a>
<a href="history/history.php" name="history_link">
<div style="background-color: green; width: 200px; float: left">
diff --git a/profile_page/profile.php b/profile_page/profile.php
index f9e04fa7ccd48f19a0e04e7c4e1b4a81322a583a..fe0ee7107ff1831532a3653cd38719227aa266f1 100755
--- a/profile_page/profile.php
+++ b/profile_page/profile.php
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../css/header.css">
</head>
<body>
- <div class="frame" id="profile_frame">
+ <div class="frame">
<div class="header">
<?php
$user_id = $_GET['id'];
@@ -26,7 +26,7 @@
mysqli_close($con);
?>
</div>
- <div class="menu">
+ <div style="background-color: white; max-width: 600px; margin-left: auto; margin-right: auto">
<?php include'../template/menu.php';?>
</div>
<div class="profile_container">
diff --git a/template/menu.php b/template/menu.php
index 1025a4052de67e249995bf35a0c0c27e3afc4127..35d90f758e5aafd506d44043a857df98c7d0094c 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,6 +1,19 @@
<?php
echo '
- <a href="../order/order.php">ORDER</a>
- <a href="../history/history.php">HISTORY</a>
- <a href="../profile_page/profile.php">PROFILE</a>';
+ <a href="order/order.php" name="order_link">
+ <div class="menu" id="order_link">
+ <h2>Order</h2>
+ </div>
+ </a>
+ <a href="history/history.php" name="history_link">
+ <div class="menu" id="history_link">
+ <h2>History</h2>
+ </div>
+ </a>
+ <a href="profile/profile.php" name="profile_link">
+ <div class="menu" id="profile_link">
+ <h2>My Profile</h2>
+ </div>
+ </a>
+ ';
?>