From 01a42af14bd276e36413854851437430e627c9b8 Mon Sep 17 00:00:00 2001
From: ayamberkakienam <zackhardyz@gmail.com>
Date: Thu, 5 Oct 2017 01:23:49 +0700
Subject: [PATCH] Modify header and menu template
---
css/default_style.css | 6 +++---
css/header.css | 6 +++---
css/profile.css | 3 +++
profile_page/profile.php | 2 +-
template/menu.php | 32 +++++++++++++++-----------------
5 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/css/default_style.css b/css/default_style.css
index 36c807bc..ebd27e67 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -46,8 +46,8 @@ a:hover {
opacity: 0.6%;
}
-/*.menu {
+.menu {
border: 0.5px solid black;
- width: 200px;
+ width: 199px;
float: left;
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/css/header.css b/css/header.css
index 599ff653..1dda58a6 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 32eb03fb..0937b736 100755
--- a/css/profile.css
+++ b/css/profile.css
@@ -90,3 +90,6 @@ input.upload_file {
height: 17px;
width: 100px;
}
+#profile_link {
+ background-color: #465d43;
+}
\ No newline at end of file
diff --git a/profile_page/profile.php b/profile_page/profile.php
index 50a7b543..fe0ee710 100755
--- a/profile_page/profile.php
+++ b/profile_page/profile.php
@@ -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 d3987333..35d90f75 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,21 +1,19 @@
<?php
echo '
- <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>
- </a>
- <a href="history/history.php" name="history_link">
- <div style="background-color: green; width: 200px; float: left">
- <h2>History</h2>
- </div>
- </a>
- <a href="profile/profile.php" name="profile_link">
- <div style="background-color: yellow; width: 200px; float: left">
- <h2>My Profile</h2>
- </div>
- </a>
- </div>
+ <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>
';
?>
--
GitLab