Skip to content

Commit 0f6741a

Browse files
author
Ellert Smári
committed
merged from samuel
1 parent 5487369 commit 0f6741a

38 files changed

+10985
-24
lines changed

‎angular/css/bootstrap-theme.css

+587
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/bootstrap-theme.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/bootstrap-theme.min.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/bootstrap.css

+6,800
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/bootstrap.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/bootstrap.min.css

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular/css/main.css

+105
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,108 @@ a.back:hover {
134134
list-style:none;
135135
padding-left:0px;
136136
}
137+
138+
@CHARSET "UTF-8";
139+
/*
140+
over-ride "Weak" message, show font in dark grey
141+
*/
142+
143+
.progress-bar {
144+
color: #333;
145+
}
146+
147+
/*
148+
Reference:
149+
http://www.bootstrapzen.com/item/135/simple-register-form-logo/
150+
*/
151+
152+
* {
153+
-webkit-box-sizing: border-box;
154+
-moz-box-sizing: border-box;
155+
box-sizing: border-box;
156+
outline: none;
157+
}
158+
159+
.form-control {
160+
position: relative;
161+
font-size: 16px;
162+
height: auto;
163+
padding: 10px;
164+
@include box-sizing(border-box);
165+
166+
&:focus {
167+
z-index: 2;
168+
}
169+
}
170+
171+
body {
172+
background: url(http://i.imgur.com/GHr12sH.jpg) no-repeat center center fixed;
173+
-webkit-background-size: cover;
174+
-moz-background-size: cover;
175+
-o-background-size: cover;
176+
background-size: cover;
177+
}
178+
.Login-form {
179+
margin-top: 60px;
180+
}
181+
182+
form[role=Login] {
183+
color: #5d5d5d;
184+
background: #f2f2f2;
185+
padding: 26px;
186+
border-radius: 10px;
187+
-moz-border-radius: 10px;
188+
-webkit-border-radius: 10px;
189+
}
190+
form[role=Login] img {
191+
display: block;
192+
margin: 0 auto;
193+
margin-bottom: 35px;
194+
}
195+
form[role=Login] input,
196+
form[role=Login] button {
197+
font-size: 18px;
198+
margin: 16px 0;
199+
}
200+
form[role=Login] > div {
201+
text-align: center;
202+
}
203+
.Loginlogo{
204+
text-align: center;
205+
}
206+
.register-form {
207+
margin-top: 60px;
208+
}
209+
210+
form[role=register] {
211+
color: #5d5d5d;
212+
background: #f2f2f2;
213+
padding: 26px;
214+
border-radius: 10px;
215+
-moz-border-radius: 10px;
216+
-webkit-border-radius: 10px;
217+
}
218+
form[role=register] img {
219+
display: block;
220+
margin: 0 auto;
221+
margin-bottom: 35px;
222+
}
223+
form[role=register] input,
224+
form[role=register] button {
225+
font-size: 18px;
226+
margin: 16px 0;
227+
}
228+
form[role=register] > div {
229+
text-align: center;
230+
}
231+
.registerlogo{
232+
text-align: center;
233+
}
234+
.form-links {
235+
text-align: center;
236+
margin-top: 1em;
237+
margin-bottom: 50px;
238+
}
239+
.form-links a {
240+
color: #fff;
241+
}

‎angular/img/logo.svg

+30
Loading

‎angular/index.html

+25-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
33
<html>
44
<head>
5-
<link href="https://s3.amazonaws.com/codecademy-content/projects/bootstrap.min.css" rel="stylesheet" />
5+
6+
<link href="css/bootstrap.css" rel="stylesheet" type="text/css" />
67
<link href="css/main.css" rel="stylesheet" />
7-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.js"></script>
8+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.min.js"></script>
89
<script src="https://code.angularjs.org/1.2.28/angular-route.min.js"></script>
910
</head>
1011
<body ng-app="HomeApp">
12+
1113
<nav class="navbar navbar-default" role="navigation">
1214
<div class="navbar-header">
1315
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@@ -38,6 +40,7 @@
3840
</form>
3941
</div>
4042
<ul class="nav navbar-nav col-sm-3 col-md-1 pull-right">
43+
<<<<<<< HEAD
4144
<li><a href="#">Register</a></li>
4245
</ul>
4346
</div>
@@ -54,5 +57,25 @@
5457
<script src="js/controllers/PostController.js"></script>
5558
<!-- Services -->
5659
<script src="js/services/directory.js"></script>
60+
=======
61+
<li><a href="#/Login">Login</a></li>
62+
</ul>
63+
</div>
64+
</nav>
65+
<div ng-view></div>
66+
<script src="js/jquery-1.10.2.js"></script>
67+
<script src="js/bootstrap.js"></script>
68+
69+
70+
<!-- Modules -->
71+
<script src="js/app.js"></script>
72+
73+
<!-- Controllers -->
74+
<script src="js/controllers/HomeController.js"></script>
75+
<script src="js/controllers/EmailController.js"></script>
76+
77+
<!-- Services -->
78+
<script src="js/services/emails.js"></script>
79+
>>>>>>> 55e08f6340beee2ed9c0736224bd225b73bac188
5780
</body>
5881
</html>

‎angular/js/app.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,26 @@ var app = angular.module('HomeApp', ['ngRoute']);
22

33
app.config(['$routeProvider', function($routeProvider) {
44
$routeProvider
5-
.when('/Home', {
5+
.when('/Home', {
66
controller: 'TopicController',
77
templateUrl: 'views/home.html'
88
})
99
.when('/Home/:id', {
1010
controller: 'PostController',
1111
templateUrl: 'views/post.html'
1212
})
13+
.when('/Login', {
14+
controller: 'LoginController',
15+
templateUrl: 'views/Login.html'
16+
})
17+
.when('/outbox/:id', {
18+
controller: 'EmailController',
19+
templateUrl: 'views/email.html'
20+
})
21+
.when('/register', {
22+
controller: 'EmailController',
23+
templateUrl: 'views/register.html'
24+
})
1325
.otherwise({
1426
redirectTo: '/Home'
1527
});

0 commit comments

Comments
 (0)