Skip to content
Snippets Groups Projects
Commit 6577f8e7 authored by Akmal Fadlurohman's avatar Akmal Fadlurohman
Browse files

Memperbaiki css frame

parents 343391c2 e4cb031f
1 merge request!45OneHundred - 13515005 - Husnulzaki Wibisono Haryadi
Hide whitespace changes
Inline Side-by-side
css/default_style.css
+ 27
− 4
View file @ 6577f8e7
.frame { .frame {
height: 550px;
width: 360px; width: 360px;
height: 450px;
margin: 50px auto; margin: 50px auto;
border: 0.5px solid black;
padding-left: 20px;
padding-right: 20px; padding-right: 20px;
padding-left: 20px;
border-top: 0.5px solid black;
border-bottom: 0.5px solid black;
border-left: 0.5px solid black;
border-right: 0.5px solid black;
font-family: calibri light;
} }
.frame h1,h2 { .frame h1,h2 {
text-align: center; text-align: center;
font-family: franklin gothic;
} }
.button { .button {
...@@ -51,6 +56,24 @@ a:hover { ...@@ -51,6 +56,24 @@ a:hover {
.menu { .menu {
border: 0.5px solid black; border: 0.5px solid black;
width: 199px; width: 119px;
float: left; float: left;
<<<<<<< HEAD
}
=======
text-align: center;
font-family: calibri;
}
.menu > h3 {
margin-top: 5%;
margin-bottom: 5%
}
.menu_container {
background-color: red;
width: 360px;
margin-left: auto;
margin-right: auto;
} }
>>>>>>> e4cb031f91cc3a69608d1c077166b3a49967d20f
css/header.css
+ 0
− 6
View file @ 6577f8e7
.header { .header {
border-bottom-style: solid;
height: 55px; height: 55px;
} }
.logo { .logo {
...@@ -24,8 +23,3 @@ ...@@ -24,8 +23,3 @@
margin: 0 ; margin: 0 ;
margin-top: 10px; margin-top: 10px;
} }
/*.menu {
text-align: center;
background-color: rgb(65,62,119);
height: 20px;
}*/
order/order.php
+ 17
− 19
View file @ 6577f8e7
...@@ -2,30 +2,28 @@ ...@@ -2,30 +2,28 @@
<html> <html>
<head> <head>
<title>U Wanna Call Me Beibh?</title> <title>U Wanna Call Me Beibh?</title>
<link rel="stylesheet" type="text/css" href="../css/main.css"> <link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/order.css"> <link rel="stylesheet" type="text/css" href="../css/order.css">
<script type="text/javascript"> <link rel="stylesheet" type="text/css" href="../css/header.css">
function setURL(url) {
document.getElementById('content_iframe').src = url;
}
</script>
</head> </head>
<body> <body>
<<<<<<< HEAD
<div class="frame"> <div class="frame">
<p>Order</p> <div class="header">
<div class="frame" id="container"> <?php
<div class="button" id="first"> $user_id = $_GET['id'];
<input type="button" name="select_location" onclick="setURL('select_location.html')" > include '../database/dbconnect.php';
$query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
if(mysqli_num_rows($query)!=0)
{
$row=mysqli_fetch_assoc($query);
$username = $row['username'];
include("../template/header.php");
}
mysqli_close($con);
?>
</div> </div>
<div class="button" id="second">
<input type="button" name="select_driver" onclick="setURL('select_driver.html')">
</div>
<div class="button" id="third">
<input type="button" name="complete_order" onclick="setURL('complete_order.html')">
</div>
<iframe id="content_iframe" src=""/>
</div> </div>
</body> </body>
</html> </html>
profile_page/profile.php
+ 1
− 1
View file @ 6577f8e7
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
mysqli_close($con); mysqli_close($con);
?> ?>
</div> </div>
<div style="background-color: white; max-width: 600px; margin-left: auto; margin-right: auto"> <div class="menu_container">
<?php include'../template/menu.php';?> <?php include'../template/menu.php';?>
</div> </div>
<div class="profile_container"> <div class="profile_container">
......
template/menu.php
+ 6
− 6
View file @ 6577f8e7
<?php <?php
echo ' echo '
<a href="order/order.php" name="order_link"> <a href="../order/order.php?id='. $user_id .'" name="order_link">
<div class="menu" id="order_link"> <div class="menu" id="order_link">
<h2>Order</h2> <h3>ORDER</h3>
</div> </div>
</a> </a>
<a href="history/history.php" name="history_link"> <a href="../history/history.php?id='. $user_id .'" name="history_link">
<div class="menu" id="history_link"> <div class="menu" id="history_link">
<h2>History</h2> <h3>HISTORY</h3>
</div> </div>
</a> </a>
<a href="profile/profile.php" name="profile_link"> <a href="../profile/profile.php?id='. $user_id .'" name="profile_link">
<div class="menu" id="profile_link"> <div class="menu" id="profile_link">
<h2>My Profile</h2> <h3>MY PROFILE</h3>
</div> </div>
</a> </a>
'; ';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment