From df2e1272a91f6afc9491527f843f931619f3944d Mon Sep 17 00:00:00 2001 From: Mikhael Artur <mikhael.artur.d@gmail.com> Date: Sat, 30 Sep 2017 05:47:12 +0700 Subject: [PATCH] Edit pref loc front end - init --- css/edit-prefered-location.css | 63 +++++++++++++++++++++++++++++++ view/Style.css => css/login.css | 0 view/Login.html | 6 ++- view/edit-prefered-locations.html | 29 ++++++++++++++ view/edit-profile.html | 6 +-- 5 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 css/edit-prefered-location.css rename view/Style.css => css/login.css (100%) create mode 100644 view/edit-prefered-locations.html diff --git a/css/edit-prefered-location.css b/css/edit-prefered-location.css new file mode 100644 index 00000000..c7f4c724 --- /dev/null +++ b/css/edit-prefered-location.css @@ -0,0 +1,63 @@ +.kotak{ + width: 40%; + margin: 20 30% 0 30%; + padding: 10 10 10 10; +} + +table{ + border-spacing: 0; +} + +th{ + text-align: center; +} + +th, td, tr{ + padding: 2; +} + +table, th, td, tr{ + width: 100%; + border: 1px solid #DDDDDD; +} + +.tabno{ + width: 10%; +} + +.tabloc{ + width: 70%; +} + +.tabact{ + width: 20%; +} + +.addset div{ + display: inline-block; + vertical-align: middle; +} + +.field{ + width: 80%; + margin-right: 4%; +} + +.field input{ + width: 100%; + height: 2em; +} + +.submitbutton{ + width: 15%; +} + +.submit{ + width: 100%; + background-color: #82D800; + border-color: #000000; + border-radius: 5px; + font-size: 130%; + padding: 0 0 0 0; + color: #008800; +} diff --git a/view/Style.css b/css/login.css similarity index 100% rename from view/Style.css rename to css/login.css diff --git a/view/Login.html b/view/Login.html index a6863dd5..7f5b421c 100644 --- a/view/Login.html +++ b/view/Login.html @@ -1,7 +1,8 @@ <html> <head> <title>Projekers - Login</title> - <link rel = "stylesheet" href = "Style.css"> + <link rel = "stylesheet" href = "../css/login.css"> + <link rel = "stylesheet" href = "../css/primary.css"> </head> <body> <div class = "kotak"> @@ -22,8 +23,9 @@ <div class="label">Password</div> <div class="field"><input type = "password"></div> </div> + <div class="linkset"> - <div class="link"><a href="">Don't have an account?</a></div> + <div class="link"><a href="signup">Don't have an account?</a></div> <div class="submitbutton"> <input type = "Submit" value = "GO!" class = "submit"> </div> diff --git a/view/edit-prefered-locations.html b/view/edit-prefered-locations.html new file mode 100644 index 00000000..c8f3b162 --- /dev/null +++ b/view/edit-prefered-locations.html @@ -0,0 +1,29 @@ +<html> + <head> + <title>Projekers - Login</title> + <link rel = "stylesheet" href = "../css/edit-prefered-location.css"> + <link rel = "stylesheet" href = "../css/primary.css"> + </head> + <body> + <div class = "kotak"> + <h1>EDIT PREFERED LOCATION</h1> + <table class="tab"> + <tr> + <th class="tabno">No</td> + <th class="tabloc">Location</td> + <th class="tabact">Actions</td> + </tr> + </table> + <br> + <br> + <h2>ADD NEW LOCATION:</h2> + <div class="addset"> + <div class="field"><input type="text"></div> + <div class="submitbutton"> + <input type="Submit" value="GO!" class="submit"> + </div> + </div> + </div> + </body> +</html> + diff --git a/view/edit-profile.html b/view/edit-profile.html index 86548a9e..0c9d3690 100644 --- a/view/edit-profile.html +++ b/view/edit-profile.html @@ -1,7 +1,7 @@ <html> <head> - <link href="../../css/primary.css" type="text/css" rel="stylesheet"> - <link href="../../css/edit-profile.css" type="text/css" rel="stylesheet"> + <link href="../css/primary.css" type="text/css" rel="stylesheet"> + <link href="../css/edit-profile.css" type="text/css" rel="stylesheet"> </head> <body> <div class="wrapper"> @@ -9,7 +9,7 @@ <form action="#" method="post"> <div class="edit-image"> <div class="div-profile-image"> - <img src="../../img/pikachu.jpg" class="profile-image"> + <img src="../img/pikachu.jpg" class="profile-image"> </div> <div class="browse-image"> <label>Update profile picture</label> -- GitLab