Skip to content

12 login #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khoadnguyen merged 7 commits into from
Sep 25, 2018
Merged

12 login #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59eae2e
added all initial buttons and inputs that match the wireframe
awstin17 Sep 18, 2018
5edf175
Made some progress on layout and styling, stuck on icon in inputs for…
awstin17 Sep 20, 2018
dd1edbd
fix(css): Fixed styling, updating input/icon.
khoadnguyen Sep 20, 2018
4335bdf
Finalized all styling. Current styles are inline in HTML. Next commit…
awstin17 Sep 22, 2018
0ab8823
moved all inline styling to scss file for login page
awstin17 Sep 22, 2018
ba89ff2
made minor tweaks to login page CSS
awstin17 Sep 22, 2018
bb26fa9
minor styling tweaks
awstin17 Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/imgs/background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 73 additions & 8 deletions src/pages/login/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,80 @@
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar>
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title>Login</ion-title>
</ion-navbar>
</ion-header>

<ion-content>

<ion-content padding>
<div id="header">
<h1 id="title">INTRANSITION</h1>
</div>

</ion-content>
<ion-grid fixed>

<br>

<ion-row>
<ion-col col-1></ion-col>
<ion-col>
<h2 text-center>Transitioning from the military to civilian environment is more than just a job change.</h2>
<br>
<h2 id="lifechange" text-center>It's a life change.</h2>
</ion-col>
<ion-col col-1></ion-col>
</ion-row>

<br>

<ion-row>
<ion-col col-1></ion-col>
<ion-col>
<ion-label class="labels" style="font-size: 25px" stacked>EMAIL ADDRESS</ion-label>
<ion-input class="inputs" type="email"></ion-input>
<ion-icon class="icons" name="person"></ion-icon>
</ion-col>
<ion-col col-1></ion-col>
</ion-row>

<ion-row>
<ion-col col-1></ion-col>
<ion-col>
<ion-label class="labels" style="font-size: 25px" stacked>PASSWORD</ion-label>
<ion-input class="inputs" type="password"></ion-input>
<ion-icon class="icons" name="lock"></ion-icon>
</ion-col>
<ion-col col-1></ion-col>
</ion-row>

<br>
<br>

<ion-row>
<ion-col col-2></ion-col>
<ion-col>
<button id="loginbutton" ion-button block>LOGIN</button>
</ion-col>
<ion-col col-2></ion-col>
</ion-row>

<br>
<br>

<ion-row>
<ion-col col-1></ion-col>
<ion-col>
<h3 text-center>If you don't have an account yet, you can register now.</h3>
</ion-col>
<ion-col col-1></ion-col>
</ion-row>

<ion-row>
<ion-col col-2></ion-col>
<ion-col>
<button id="signupbutton" ion-button block>SIGN UP</button>
</ion-col>
<ion-col col-2></ion-col>
</ion-row>

</ion-grid>

</ion-content>
54 changes: 54 additions & 0 deletions src/pages/login/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,57 @@
page-login {

#header {
display: flex;
padding: 65px;
justify-content: center;
align-items: center;

background-position: 0px -250px;
background-size: 100% 500%;
background-image: url('../assets/imgs/background.png');
}

#title {
letter-spacing: 3px;
font-weight: bold;
font-family: proxima-nova;
font-size: 70px;
color: white;
}

#lifechange {
font-weight: bold;
}

.labels {
color: rgb(96,96,96);
font-size: 25px;
}

.inputs {
border: 1px solid rgb(229, 230, 230);
background-color: rgb(248, 248, 248);
padding-left: 60px;
font-size: 25px
}

.icons {
color: rgb(130,180,64);
font-size: 35px;
position: absolute;
top: 60px;
left: 20px
}

#loginbutton {
background-color: rgb(130,180,64);
font-size: 25px
}

#signupbutton {
background-color: rgb(42,61,79);
font-size: 25px
}

}