From 325f44321daf0fe905e129c06faee6ce04c101bd Mon Sep 17 00:00:00 2001
From: "fariz.tumbuan" <13515050@std.stei.itb.ac.id>
Date: Sat, 7 Oct 2017 13:16:39 +0800
Subject: [PATCH] Merapikan layout secara umum
---
css/default_style.css | 22 +++++++++++++++++++---
css/header.css | 5 +++++
css/profile.css | 1 -
template/header.php | 2 +-
template/menu.php | 37 +++++++++++++++++++------------------
5 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/css/default_style.css b/css/default_style.css
index cb3a7d17..2a94eb99 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -7,6 +7,7 @@ body {
width: 360px;
height: 550px;
margin: 50px auto;
+ padding: 5px 20px;
padding-right: 20px;
padding-left: 20px;
border-top: 0.5px solid black;
@@ -80,14 +81,13 @@ a:hover {
}
.menu_container {
- background-color: red;
width: 360px;
- margin-left: auto;
- margin-right: auto;
+ margin: 15px auto 5px auto;
}
.subheader {
height: 15%;
+ margin-bottom: 10px;
}
.title {
float: left;
@@ -112,3 +112,19 @@ a:hover {
height: 100%;
width: 100%;
}
+
+ul.nav_bar {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ display: table;
+ width: inherit;
+}
+
+ul.nav_bar > li {
+ display: table-cell;
+}
+
+#main_nav_bar.nav_bar > li {
+}
\ No newline at end of file
diff --git a/css/header.css b/css/header.css
index 6e015048..d2e6ca95 100644
--- a/css/header.css
+++ b/css/header.css
@@ -23,3 +23,8 @@
margin: 0 ;
margin-top: 10px;
}
+
+div.greeting a, div.greeting a:link, div.greeting a:visited {
+ color: blue;
+ text-decoration: underline;
+}
diff --git a/css/profile.css b/css/profile.css
index 9b23357e..866e0254 100755
--- a/css/profile.css
+++ b/css/profile.css
@@ -1,5 +1,4 @@
.profile_container {
- margin-top: 10%;
height: 50%;
}
diff --git a/template/header.php b/template/header.php
index 7dc0dbde..6326dc14 100644
--- a/template/header.php
+++ b/template/header.php
@@ -1,6 +1,6 @@
<?php
echo '<div class="logo">
- <h1>OneHundred</h1>
+ <h1><span style="color: red;">One</span><span style="color: green;">Hundred</span></h1>
<p>"An ojek for anything you need"</p></br>
</div>
<div class="greeting">
diff --git a/template/menu.php b/template/menu.php
index 88a34fc0..8cfc8e47 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,19 +1,20 @@
<?php
- echo '
- <a href="../order/select_location.php?id='. $user_id .'" name="order_link">
- <div class="menu" id="order_link">
- <h3>ORDER</h3>
- </div>
- </a>
- <a href="../history/transaction_history.php?id='. $user_id .'" name="history_link">
- <div class="menu" id="history_link">
- <h3>HISTORY</h3>
- </div>
- </a>
- <a href="../profile/profile.php?id='. $user_id .'" name="profile_link">
- <div class="menu" id="profile_link">
- <h3>MY PROFILE</h3>
- </div>
- </a>
- ';
-?>
+ echo '
+ <ul id="main_nav_bar" class="nav_bar">
+ <li>
+ <a class="menu" id="order_link" href="../order/select_location.php?id='. $user_id .'" name="order_link">
+ <h3>ORDER</h3>
+ </a>
+ </li>
+ <li>
+ <a class="menu" id="history_link" href="../history/transaction_history.php?id='. $user_id .'" name="history_link">
+ <h3>HISTORY</h3>
+ </a>
+ </li>
+ <li>
+ <a class="menu" id = "profile_link" href="../profile/profile.php?id='. $user_id .'" name="profile_link">
+ <h3>MY PROFILE</h3>
+ </a>
+ </li>
+ </ul>';
+?>
\ No newline at end of file
--
GitLab