Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit 57055a3

Browse files
VikramTiwariVikramTiwari
committed
Everything Latest
Bootstrap Latest Angular Bootstrap Latest Angular UI-Utils Latest
1 parent 02ff85a commit 57055a3

File tree

11 files changed

+76
-78
lines changed

11 files changed

+76
-78
lines changed

‎app/views/includes/foot.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ script(type='text/javascript', src='/lib/angular-route/angular-route.js')
77
//Angular UI
88
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')
99
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
10-
script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js')
10+
script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.min.js')
1111

1212
//Application Init
1313
script(type='text/javascript', src='/js/app.js')

‎app/views/includes/head.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ head
1919
meta(property='og:site_name', content='MEAN - A Modern Stack')
2020
meta(property='fb:admins', content='APP_ADMIN')
2121

22-
link(rel='stylesheet', href='/lib/bootstrap/docs/assets/css/bootstrap.css')
22+
link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css')
2323
//- link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap-responsive.css')
2424
link(rel='stylesheet', href='/css/common.css')
2525

‎app/views/users/auth.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extends ../layouts/default
22

33
block content
44
.row
5-
.offset1.span5
5+
.col-md-offset-1.col-md-5
66
a(href="/auth/facebook")
77
img(src="/img/icons/facebook.png")
88
a(href="/auth/github")
@@ -11,7 +11,7 @@ block content
1111
img(src="/img/icons/twitter.png")
1212
a(href="/auth/google")
1313
img(src="/img/icons/google.png")
14-
.span6
14+
.col-md-6
1515
if message && message.length
1616
.fade.in.alert.alert-error
1717
button.close(type="button", data-dismiss="alert") ×

‎app/views/users/signin.jade

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ extends auth
22

33
block auth
44
form.signin.form-horizontal(action="/users/session", method="post")
5-
.control-group
6-
label.control-label(for='email') Email
7-
.controls
8-
input#email(type='text', name="email", placeholder='Email')
5+
.form-group
6+
label.col-md-4.control-label(for='email') Email
7+
.col-md-8
8+
input#email.form-control(type='text', name="email", placeholder='Email')
99

10-
.control-group
11-
label.control-label(for='password') Password
12-
.controls
13-
input#password(type='password', name="password", placeholder='Password')
10+
.form-group
11+
label.col-md-4.control-label(for='password') Password
12+
.col-md-8
13+
input#password.form-control(type='password', name="password", placeholder='Password')
1414

15-
.form-actions
16-
button.btn.btn-primary(type='submit') Sign in
17-
 
18-
| or 
19-
a.show-signup(href="/signup") Sign up
15+
.form-group
16+
.col-md-offset-4.col-md-8
17+
button.btn.btn-primary(type='submit') Sign in
18+
 
19+
| or 
20+
a.show-signup(href="/signup") Sign up

‎app/views/users/signup.jade

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@ extends auth
22

33
block auth
44
form.signup.form-horizontal(action="/users", method="post")
5-
.control-group
6-
label.control-label(for='name') Full name
7-
.controls
8-
input#name(type='text', name="name", placeholder='Full name', value=user.name)
5+
.form-group
6+
label.col-md-4.control-label(for='name') Full Name
7+
.col-md-8
8+
input#name.form-control(type='text', name="name", placeholder='Full name', value=user.name)
99

10-
.control-group
11-
label.control-label(for='email') Email
12-
.controls
13-
input#email(type='text', name="email", placeholder='Email', value=user.email)
10+
.form-group
11+
label.col-md-4.control-label(for='email') Email
12+
.col-md-8
13+
input#email.form-control(type='text', name="email", placeholder='Email', value=user.email)
1414

15-
.control-group
16-
label.control-label(for='username') Username
17-
.controls
18-
input#username(type='text', name="username", placeholder='Username', value=user.username)
15+
.form-group
16+
label.col-md-4.control-label(for='username') Username
17+
.col-md-8
18+
input#username.form-control(type='text', name="username", placeholder='Username', value=user.username)
1919

20-
.control-group
21-
label.control-label(for='password') Password
22-
.controls
23-
input#password(type='password', name="password", placeholder='Password')
20+
.form-group
21+
label.col-md-4.control-label(for='password') Password
22+
.col-md-8
23+
input#password.form-control(type='password', name="password", placeholder='Password')
2424

25-
.form-actions
26-
button.btn.btn-primary(type='submit') Sign up
27-
 
28-
| or 
29-
a.show-login(href="/signin") login
25+
.form-group
26+
.col-md-offset-4.col-md-8
27+
button.btn.btn-primary(type='submit') Sign up
28+
 
29+
| or 
30+
a.show-login(href="/signin") login

‎bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "mean",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"dependencies": {
55
"angular": "latest",
66
"angular-resource": "latest",
77
"angular-cookies": "latest",
88
"angular-mocks": "latest",
99
"angular-route": "latest",
10-
"bootstrap": "2.3.2",
11-
"angular-bootstrap": "0.7.0",
12-
"angular-ui-utils": "0.0.4"
10+
"bootstrap": "latest",
11+
"angular-bootstrap": "latest",
12+
"angular-ui-utils": "latest"
1313
}
1414
}

‎public/css/common.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
}
55

66
.content {
7-
margin-top:50px;
7+
margin-top:70px;
88
width:100%
99
}
1010

‎public/views/articles/create.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<section data-ng-controller="ArticlesController">
2-
<form class="form-horizontal" data-ng-submit="create()">
3-
<div class="control-group">
4-
<label class="control-label" for="title">Title</label>
5-
<div class="controls">
6-
<input type="text" data-ng-model="title" id="title" placeholder="Title" required>
2+
<form class="form-horizontal col-md-6" role="form" data-ng-submit="create()">
3+
<div class="form-group">
4+
<label for="title" class="col-md-2 control-label">Title</label>
5+
<div class="col-md-10">
6+
<input type="text" class="form-control" data-ng-model="title" id="title" placeholder="Title" required>
77
</div>
88
</div>
9-
<div class="control-group">
10-
<label class="control-label" for="content">Content</label>
11-
<div class="controls">
12-
<textarea data-ng-model="content" id="content" cols="30" rows="10" placeholder="Content"></textarea>
9+
<div class="form-group">
10+
<label for="content" class="col-md-2 control-label">Content</label>
11+
<div class="col-md-10">
12+
<textarea data-ng-model="content" id="content" cols="30" rows="10" placeholder="Content" class="form-control" required></textarea>
1313
</div>
1414
</div>
15-
<div class="control-group">
16-
<div class="controls">
17-
<input type="submit" class="btn">
15+
<div class="form-group">
16+
<div class="col-md-offset-2 col-md-10">
17+
<button type="submit" class="btn btn-default">Submit</button>
1818
</div>
1919
</div>
2020
</form>

‎public/views/articles/edit.html

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
2-
<form class="form-horizontal" data-ng-submit="update()">
3-
<div class="control-group">
4-
<label class="control-label" for="title">Title</label>
5-
6-
<div class="controls">
7-
<input type="text" data-ng-model="article.title" id="title" placeholder="Title" required>
8-
</input>
2+
<form class="form-horizontal col-md-6" role="form" data-ng-submit="update()">
3+
<div class="form-group">
4+
<label for="title" class="col-md-2 control-label">Title</label>
5+
<div class="col-md-10">
6+
<input type="text" class="form-control" data-ng-model="article.title" id="title" placeholder="Title" required>
97
</div>
108
</div>
11-
<div class="control-group">
12-
<label class="control-label" for="content">Content</label>
13-
14-
<div class="controls">
15-
<textarea data-ng-model="article.content" id="content" cols="30" rows="10" placeholder="Content">
16-
</textarea>
9+
<div class="form-group">
10+
<label for="content" class="col-md-2 control-label">Content</label>
11+
<div class="col-md-10">
12+
<textarea data-ng-model="article.content" id="content" cols="30" rows="10" placeholder="Content" class="form-control" required></textarea>
1713
</div>
1814
</div>
19-
<div class="control-group">
20-
<div class="controls">
21-
<input type="submit" class="btn">
15+
<div class="form-group">
16+
<div class="col-md-offset-2 col-md-10">
17+
<button type="submit" class="btn btn-default">Submit</button>
2218
</div>
2319
</div>
2420
</form>

‎public/views/articles/view.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<h2>{{article.title}}</h2>
55
<div data-ng-show="global.user._id == article.user._id">
66
<a class="btn" href="/#!/articles/{{article._id}}/edit">
7-
<i class="icon-edit"></i>
7+
<i class="glyphicon glyphicon-edit"></i>
88
</a>
99
<a class="btn" data-ng-click="remove();">
10-
<i class="icon-trash"></i>
10+
<i class="glyphicon glyphicon-trash"></i>
1111
</a>
1212
</div>
1313
<div>{{article.content}}</div>

0 commit comments

Comments
 (0)