From 44cc477ffdc5238db00fb18cd35f890b74fa300f Mon Sep 17 00:00:00 2001
From: Mikhael Artur <mikhael.artur.d@gmail.com>
Date: Sat, 7 Oct 2017 06:37:00 +0700
Subject: [PATCH] Fix logout redirect and login styling
---
css/index.css | 48 +++++++++++++++++---------------
view/dashboard.php | 2 +-
view/edit-prefered-locations.php | 3 ++
view/index.php | 9 +++---
4 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/css/index.css b/css/index.css
index 24396741..e4d51e10 100644
--- a/css/index.css
+++ b/css/index.css
@@ -6,23 +6,22 @@
border-radius: 50px;
}
-.horizontal{
- text-align: center;
- border-bottom: 2px solid #02702C;
- width: 25%;
- float: left;
- margin: 35 2.5% 100 2.5%;
+.logo {
+ display: inline-block;
+ width: 100%;
+ text-align: center;
+ font-size: 350%;
+ vertical-align: middle;
+ color: #02702C;
+ font-weight: bold;
+ margin: 10 0 80 0;
}
-.judul{
- font-family: "Arial";
- font-weight: bold;
- text-align: center;
- font-size: 300%;
- color: #008800;
- margin: 10 0 50 0;
- width: 40%;
- float: left;
+.line {
+ display: inline-block;
+ width: 22%;
+ vertical-align: middle;
+ border: 1px solid #02702C;
}
.form_input{
@@ -31,8 +30,8 @@
}
.set div{
- text-align: center;
display: inline-block;
+ margin-left: 7%;
}
.form_input input{
@@ -41,29 +40,34 @@
.label{
margin-top: 2;
- width: 35%;
+ width: 20%;
text-align: left;
vertical-align: middle;
font-family: "Arial";
- font-weight: bold;
- color: #008800;
+ color: #02702C;
font-size: 150%;
}
.field{
width: 60%;
vertical-align: middle;
+ border: 1px solid #02702C;
+ text-align: right;
}
.field input{
width:100%;
height: 2em;
}
+
.linkset div{
display: inline-block;
+ margin-left: 7%;
}
+
.submitbutton{
margin-top:5px;
+ text-align: right;
}
.submit{
@@ -73,14 +77,14 @@
width: 200%;
font-size: 120%;
padding: 0 0 0 0;
- color: #008800;
+ color: #333333;
font-weight: bold;
margin: 50 2.5% 20 2.5%;
}
.link{
+ text-align: left;
font-family: "Arial";
- width: 70%;
+ width: 69%;
text-align: left;
- margin-left: 3%;
}
\ No newline at end of file
diff --git a/view/dashboard.php b/view/dashboard.php
index f6c82e3f..b38a36db 100644
--- a/view/dashboard.php
+++ b/view/dashboard.php
@@ -20,7 +20,7 @@
<div class="logo"><img src="../img/logo.png" /></div>
<div class="logout-panel">
<div id="username"></div>
- <a href="index.html">Logout</a>
+ <a href="index.php">Logout</a>
</div>
</div>
<div class="menu">
diff --git a/view/edit-prefered-locations.php b/view/edit-prefered-locations.php
index 9c45d20c..739d1e3f 100644
--- a/view/edit-prefered-locations.php
+++ b/view/edit-prefered-locations.php
@@ -64,6 +64,9 @@
<input type="Submit" value="ADD" class="submit">
</div>
</div>
+ <div>
+
+ </div>
</div>
</body>
</html>
diff --git a/view/index.php b/view/index.php
index d849f9e6..2a45e490 100644
--- a/view/index.php
+++ b/view/index.php
@@ -24,12 +24,11 @@
</head>
<body>
<div class = "container">
- <div>
- <div class = "horizontal"></div>
- <div class = "judul">LOGIN</div>
- <div class = "horizontal"></div>
+ <div class="logo">
+ <hr class="line">
+ LOGIN
+ <hr class="line">
</div>
-
<div class = "form_input">
<form method="POST">
<div class="set">
--
GitLab