diff --git a/src/css/fan.css b/src/css/fan.css
index d10154db010e15b67f16c5761f6c22198d8cb0eb..54de30b867f1a1657acd9642f735d709cd82f2b7 100644
--- a/src/css/fan.css
+++ b/src/css/fan.css
@@ -170,8 +170,12 @@ nav ul li a:hover {
text-decoration: none;
color: white;
background: #465D43;
-
}
+nav ul li a.active {
+ color: white;
+ background: #465D43;
+}
+
/* Button */
.btn-flat {
cursor: pointer;
diff --git a/src/css/fan2.css b/src/css/fan2.css
index aadd4ae96df153cdcb327ab9ebe1a841ac295e3e..211d12d8d89258a40965ad7cd03beea9c154afcb 100644
--- a/src/css/fan2.css
+++ b/src/css/fan2.css
@@ -1,7 +1,7 @@
/* Main Container */
.card {
margin-top: 20px;
- width: 750px;
+ width: 40%;
}
/* Elements */
@@ -17,6 +17,16 @@
text-align: center;
}
+.box a {
+ display: block;
+ padding: 10px;
+}
+
+.box a:hover {
+ background-color: #465D43;
+ color: white;
+}
+
.order-step {
padding: 10px;
margin-left: 20px;
@@ -43,10 +53,17 @@
font-weight: bold;
}
+.font-navbar a {
+ text-decoration: none;
+ color: black;
+}
/* Selection */
.selected-navbar {
- background-color: green;
+ background-color: #465D43;
+}
+
+.selected-navbar a {
color: white;
}
@@ -84,10 +101,10 @@
/* Pictures */
.profilepic {
- width: 150px;
- height: 150px;
+ width: 116px;
+ height: 116px;
border-radius: 50%;
- border: 4px solid black;
+ border: 6px solid black;
}
.editpic {
diff --git a/src/css/styles.css b/src/css/styles.css
index 65a39fbca0436cadc6a4002837531781c9109434..bd7358f1ea8740ec0bb1224e68a5a98338929fb4 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -30,9 +30,7 @@ li a:hover {
background-color: #00897B;
}
.container {
- margin-top: 25px;
- margin-left: 50px;
- margin-right: auto;
+ margin: 25px auto auto;
text-align: center;
}
h1 {
@@ -42,27 +40,28 @@ h1 {
text-align: center;
text-transform: uppercase;
z-index: 1;
+ color: #02702C;
}
h1:before {
- border-top: 2px solid #33691E;
+ border-top: 2px solid #02702C;
content:"";
margin: 0 auto;
position: absolute;
top: 15px; left: 0; right: 0; bottom: 0;
- width: 95%;
+ width: 86%;
z-index: -1;
}
-h1 span { background: #7CB342; padding: 0 10px; }
+h1 span { background: #8BBD3C; padding: 0 23px; }
.box {
width: 400px;
box-sizing: content-box;
box-shadow: #000000;
- border: 8px solid #33691E;
+ border: 8px solid #02702C;
text-align: justify;
- background-color: #7CB342;
+ background-color: #8BBD3C;
border-radius: 40px;
margin: auto;
height: 500px;
@@ -72,30 +71,42 @@ button {
width: 120px;
height: 50px;
margin: 40px auto;
- background-color: #64DD17;
- border: 3px solid #33691E;
+ background-color: #82D800;
+ border: 3px solid black;
border-radius: 10px;
font-size: 30px;
float: right;
- position: relative; right: 40px;
+ position: relative;
+ right: 20px;
}
label {
- font-size: 18px;
- margin: 5px 10px;
- color: #33691E;
+ font-size: 24px;
+ padding-left: 24px;
+ color: #02702C;
display: inline-block;
- float: left;
- clear: left;
- width: 150px;
- text-align: left;
- height: 25px;
+ float: left;
+ clear: left;
+ width: 128px;
+ text-align: left;
+ height: 25px;
+}
+.register label {
+ font-size: 16px;
+ margin: 5px 0px;
+ padding-left: 12px;
+ color: #02702C;
+ display: inline-block;
+ float: left;
+ clear: left;
+ width: 142px;
+ text-align: left;
+ height: 25px;
}
.btn-register {
- /*width: 100%;*/
height: 50px;
margin: 40px auto;
- background-color: #64DD17;
- border: 3px solid #33691E;
+ background-color: #82D800;
+ border: 3px solid black;
border-radius: 10px;
font-size: 20px;
float: right;
@@ -106,12 +117,11 @@ label {
}
.form-control {
height: 25px;
- border: none;
- border-radius: 5px;
- padding: 5px; /* Some padding */
- border: 1px solid #ccc; /* Gray border */
- box-sizing: border-box; /* Make sure that padding and width stays in place */
- margin-top: 5px; /* Add a top margin */
+ width: 227px;
+ padding: 5px;
+ border: 1px solid black;
+ box-sizing: border-box;
+ margin-top: 5px;
margin-bottom: 5px;
resize: vertical /* Allow the user to vertically resize the textarea (not horizontally) */
}
@@ -120,7 +130,7 @@ label {
font-size: 14px;
float: left;
margin: 50px 25px;
- color: black;
+ color: #333333;
}
.signin-link {
font-size: 14px;
@@ -129,17 +139,12 @@ label {
color: black;
}
.checkbox {
- font-size: 14px;
+ font-size: 16px;
+ color: #02702C;
float: left;
margin: 5px;
}
-.container {
- width: 50%;
- margin-top: 50px;
- margin-left: 100px;
-
-}
img {
width : 150px;
diff --git a/src/dbconfig.php b/src/dbconfig.php
index a13e908d228a97dc4cdb416ceec6db52e133c999..77d437344bf0adcf1a53e7278f0f058093810015 100644
--- a/src/dbconfig.php
+++ b/src/dbconfig.php
@@ -1,7 +1,7 @@
<?php
define('DB_SERVER', 'localhost');
define('DB_USERNAME', 'root');
- define('DB_PASSWORD', '');
+ define('DB_PASSWORD', 'root');
define('DB_NAME', 'tubes1-wbd');
?>
diff --git a/src/login.php b/src/login.php
index 1c3b9bbce8fb0ee912c25ec8344ca0203258468d..36226605185a77cf1fdfc3dde2ac6336bd00c343 100644
--- a/src/login.php
+++ b/src/login.php
@@ -6,12 +6,6 @@
<link rel="stylesheet" href="css/styles.css">
</head>
<body>
- <nav>
- <ul>
- <li><a href="#home">Home</a></li>
- <li><a href="#about">About</a></li>
- </ul>
- </nav>
<div class="container">
<div class="box">
<h1 class="no-background">
diff --git a/src/profile.php b/src/profile.php
index f751c71eeb82d56476a5bf4b43e9b4dfc2db84db..cac3a3496db20a4c00fd37d7624408d68dbdccc4 100644
--- a/src/profile.php
+++ b/src/profile.php
@@ -39,8 +39,7 @@ require_once 'dbconfig.php';
<div class="rowflex">
<div class="flexone">
<div>
- <span class="font-header" style="color: green;">PR</span>
- -
+ <span class="font-header" style="color: green;">PR-</span>
<span class="font-header" style="color: red;">OJEK</span>
</div>
<div style="color: green;">
@@ -50,16 +49,16 @@ require_once 'dbconfig.php';
<div class="mtop10 flexone textright">
<span>Hi, </span>
- <span id="username"><?php echo $username ?></span>
+ <span><b><?php echo $username ?></b>!</span>
<br />
<a href="#">Logout</a>
</div>
</div>
<div class="mtop10 rowflex">
- <div class="flexone box font-navbar">ORDER</div>
- <div class="flexone box font-navbar">HISTORY</div>
- <div class="flexone box font-navbar selected-navbar">MY PROFILE</div>
+ <div class="flexone box font-navbar"><a href="">ORDER</a></div>
+ <div class="flexone box font-navbar"><a href="">HISTORY</a></div>
+ <div class="flexone box font-navbar selected-navbar"><a href="">MY PROFILE</a></div>
</div>
<div class="mtop10">
@@ -78,7 +77,7 @@ require_once 'dbconfig.php';
<?php echo $fullname?>
</div>
<?php if($isdriver) {
- echo '<span id="isdriver">Driver</span><span >| '. $avg_vote . '(' . $n_voters .')' . '</span>'; }
+ echo '<span id="isdriver">Driver</span><span >| → '. $avg_vote . '(' . $n_voters .')' . '</span>'; }
else {
echo '<span>Non-Driver</span>';
}?>
diff --git a/src/register.php b/src/register.php
index 3471ab5241de85e7168ed0dda4b4296a714aadc3..c6add5d35b19837af04b18f7f8800096d340cb15 100644
--- a/src/register.php
+++ b/src/register.php
@@ -7,18 +7,12 @@
<script src="js/register.js" charset="utf-8"></script>
</head>
<body>
- <nav>
- <ul>
- <li><a href="#home">Home</a></li>
- <li><a href="#about">About</a></li>
- </ul>
- </nav>
- <div class="container">
+ <div class="container register">
<div class="box">
<h1 class="no-background">
<span><b>SIGN UP</b></span>
</h1>
- <form class="form-group" onsubmit="return submitForm()" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
+ <form onsubmit="return submitForm()" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" method="post">
<label>Your Name</label>
<input type="text" class="form-control" name="nama" >
<label>Username</label>