From 29d472cfcfd75f01542070ab4e8c163344dee2a2 Mon Sep 17 00:00:00 2001
From: ayamberkakienam <zackhardyz@gmail.com>
Date: Thu, 5 Oct 2017 00:55:12 +0700
Subject: [PATCH] Add frame border, modification on profile php ongoing
---
css/default_style.css | 13 +++++++++++--
css/profile.css | 4 ----
main.html | 6 +++---
profile_page/profile.php | 2 +-
template/menu.php | 21 ++++++++++++++++++---
5 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/css/default_style.css b/css/default_style.css
index e7906e20..36c807bc 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,11 @@ a:link, a:visited {
}
a:hover {
- opacity: 10%;
-}
\ No newline at end of file
+ opacity: 0.6%;
+}
+
+/*.menu {
+ border: 0.5px solid black;
+ width: 200px;
+ float: left;
+}*/
\ No newline at end of file
diff --git a/css/profile.css b/css/profile.css
index 6a9f6e1f..32eb03fb 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;
diff --git a/main.html b/main.html
index dc2d71b3..eaf8598a 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 f9e04fa7..50a7b543 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'];
diff --git a/template/menu.php b/template/menu.php
index 1025a405..d3987333 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,6 +1,21 @@
<?php
echo '
- <a href="../order/order.php">ORDER</a>
- <a href="../history/history.php">HISTORY</a>
- <a href="../profile_page/profile.php">PROFILE</a>';
+ <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>
+ ';
?>
--
GitLab