Memperbaiki tampilan login

12b396cd · Akmal Fadlurohman · 20b5e359 · 01a42af1 · 12b396cd · 12b396cd
Commit 12b396cd authored 7 years ago by Akmal Fadlurohman
--- a/css/default_style.css
+++ b/css/default_style.css
 .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
--- a/css/header.css
+++ b/css/header.css
 .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;
-}
+}*/
--- a/css/profile.css
+++ b/css/profile.css
-#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
--- 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">

--- 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">

--- a/template/menu.php
+++ b/template/menu.php
 <?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>
+    ';
 ?>