Skip to content

Commit

Permalink
Merge pull request #16 from Dev-Qwerty/frontend-main
Browse files Browse the repository at this point in the history
couple of fixes
  • Loading branch information
alanmatw committed Feb 20, 2020
2 parents 80d3b3c + 2b37589 commit 8ee8927
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 10 deletions.
8 changes: 4 additions & 4 deletions client/src/App.vue
@@ -1,19 +1,19 @@
<template>
<div id="app">
<GHMain />
<SMain />
</div>
</template>

<script>
//import Main from './components/Home/Main.vue'
//import LMain from './components/Login/LMain.vue'
//import SMain from './components/Signup/SMain.vue'
import GHMain from "./components/GetHired/GHMain.vue";
import SMain from './components/Signup/SMain.vue'
//import GHMain from "./components/GetHired/GHMain.vue";
export default {
name: "app",
components: {
GHMain
SMain
}
};
</script>
Expand Down
4 changes: 3 additions & 1 deletion client/src/components/GetHired/GHbox.vue
Expand Up @@ -116,7 +116,9 @@
margin-bottom: 20px;
}
.img {
height: 300px;
margin-left: -100px;
margin-top: -50px;
height: 400px;
flex-grow:1;
overflow: hidden;
perspective: 1px;
Expand Down
37 changes: 34 additions & 3 deletions client/src/components/Home/LandingBox.vue
Expand Up @@ -3,12 +3,16 @@
<h3>YOUR SERVICE EXPERT</h3>
<h5>Get instant access to reliable</h5>
<h5>and affordable services</h5>
<div class="input-group mb-3">
<!-- <div class="input-group mb-3">
<input type="text" class="form-control" placeholder="location" aria-label="Recipient's username" aria-describedby="basic-addon2">
<div class="input-group-append">
<button class="btn btn-outline-secondary" type="button">search</button>
</div>
</div>
</div> -->
<div class="Grid4">
<input type="text" value="location" class="Grid4-box1">
<input type="submit" value="search" class="Grid4-box2">
</div>
</div>
</template>

Expand Down Expand Up @@ -42,7 +46,34 @@
padding-bottom: 0px;
text-align: center;
}
.input-group {
/* .input-group {
padding-top: 40px;
} */
.Grid4 {
height: 35px;
padding-left: 20px;
margin: 25px;
display: grid;
grid-template-columns: 4fr 1fr;
border: 1px solid #dedee0;
border-radius: 30px;
box-shadow: 2px 4px #dedee0;
}
.Grid4-box1 {
border: none;
background-color: #fff;
color: #aaa;
font-family: Arial;
font-size: 17px;
padding: 5px;
}
.Grid4-box2 {
/* border: 1px solid #aaa; */
border: none;
background-color: #fff;
color: #aaa;
width: 70px;
font-family: Arial;
font-size: 17px;
}
</style>
4 changes: 2 additions & 2 deletions client/src/components/Signup/Sbox.vue
Expand Up @@ -2,10 +2,10 @@
<div class = "box">
<form action="" method="POST">
<div>
<input class="input-box" type="text" name="email" placeholder="EMAIL">
<input class="input-box" type="email" name="email" placeholder="EMAIL">
</div>
<div>
<input class="input-box" type="text" name="phoneno" placeholder="PHONENO">
<input class="input-box" type="number" name="phoneno" placeholder="PHONENO">
</div>
<div>
<input class="input-box" type="Password" name="password" placeholder="PASSWORD">
Expand Down

0 comments on commit 8ee8927

Please sign in to comment.