From 7d44e03c2bb50d053836972380d9f24418277142 Mon Sep 17 00:00:00 2001
From: ayamberkakienam <zackhardyz@gmail.com>
Date: Wed, 4 Oct 2017 23:16:07 +0700
Subject: [PATCH] Modify sign up page
---
css/default_style.css | 8 --------
css/login.css | 20 ++++++++++++--------
login/sign_up.html | 2 +-
main.html | 24 ++++++++++++++++++++++++
4 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/css/default_style.css b/css/default_style.css
index b191c07d..14a742c5 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -1,12 +1,4 @@
-body {
- background-color: rgb(210,210,210);
- color: rgb(250,250,250);
-}
-
.frame {
- border: 6px solid rgb(65,62,119);
- border-radius: 10px;
- background-color: rgb(92,88,138);
margin: 50px auto;
}
diff --git a/css/login.css b/css/login.css
index 2e504a13..4c55ceda 100755
--- a/css/login.css
+++ b/css/login.css
@@ -1,16 +1,19 @@
-#login_frame {
+.frame {
height: 550px;
width: 400px;
+ border: 10px solid #02702c;
+ border-radius: 70px;
+ background-color: #8bbd3c;
}
-#login_frame > div {
+.frame > div {
left: 10%;
width: 80%;
height: auto;
position: relative;
}
-#login_frame input[type="submit"] {
+.frame input[type="submit"] {
border-radius: 40px;
background-color: rgb(191,216,255);
padding: 5px 3px;
@@ -22,16 +25,17 @@
color: rgb(92,88,138);
}
-#login_frame input[type="submit"]:hover {
+.frame input[type="submit"]:hover {
opacity: 0.6;
}
-#sign_up_frame {
+.frame {
height: 550px;
width: 400px;
+ border-radius: 25px;
}
-#sign_up_frame input[type="submit"] {
+.frame input[type="submit"] {
border-radius: 40px;
background-color: rgb(191,216,255);
padding: 5px 3px;
@@ -42,11 +46,11 @@
margin: 0 auto 15px;
}
-#sign_up_frame input[type="submit"]:hover {
+.frame input[type="submit"]:hover {
opacity : 0.6;
}
-#sign_up_frame > div {
+.frame > div {
left: 10%;
width: 80%;
height: auto;
diff --git a/login/sign_up.html b/login/sign_up.html
index 9a2f648b..937ecee5 100755
--- a/login/sign_up.html
+++ b/login/sign_up.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="../css/login.css">
</head>
<body>
- <div id="sign_up_frame" class="frame">
+ <div class="frame">
<h1>-- Sign up --</h1>
<div>
diff --git a/main.html b/main.html
index 99d4e4cd..dc2d71b3 100644
--- a/main.html
+++ b/main.html
@@ -28,6 +28,30 @@
</div>
</a>
</div>
+
+ <!-- Actual content -->
+ <div>
+ <h1>MAKE AN ORDER</h1>
+ <div style="background-color: white; max-width: 600px; margin-left: auto; margin-right: auto">
+ <a href="order/select_location.html">
+ <div style="width:150px; float: left; margin-left: 5%; border: 5px solid black">
+ Select Destination
+ </div>
+ </a>
+
+ <a href="order/select_driver.html">
+ <div style="width:150px; float: left; margin-left: 5px; margin-right: 5px; border: 5px solid black">
+ Select Driver
+ </div>
+ </a>
+
+ <a href="order/complete_order.html">
+ <div style="width:150px; float: left; margin-right: 5%; border: 5px solid black">
+ Complete Order
+ </div>
+ </a>
+ </div>
+ </div>
</div>
</body>
</html>
\ No newline at end of file
--
GitLab