From 57055a355b4715b2ea874b723a86c42933c24f70 Mon Sep 17 00:00:00 2001 From: VikramTiwari Date: Wed, 15 Jan 2014 11:57:23 +0530 Subject: [PATCH 1/2] Everything Latest Bootstrap Latest Angular Bootstrap Latest Angular UI-Utils Latest --- app/views/includes/foot.jade | 2 +- app/views/includes/head.jade | 2 +- app/views/users/auth.jade | 4 +-- app/views/users/signin.jade | 27 +++++++++---------- app/views/users/signup.jade | 43 ++++++++++++++++--------------- bower.json | 8 +++--- public/css/common.css | 2 +- public/views/articles/create.html | 24 ++++++++--------- public/views/articles/edit.html | 28 +++++++++----------- public/views/articles/view.html | 4 +-- public/views/header.html | 10 +++---- 11 files changed, 76 insertions(+), 78 deletions(-) diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index ed4e83f80f..ba1d6e57bf 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -7,7 +7,7 @@ script(type='text/javascript', src='/lib/angular-route/angular-route.js') //Angular UI script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js') script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js') -script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js') +script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.min.js') //Application Init script(type='text/javascript', src='/js/app.js') diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade index 8daa225acf..458c122d7b 100755 --- a/app/views/includes/head.jade +++ b/app/views/includes/head.jade @@ -19,7 +19,7 @@ head meta(property='og:site_name', content='MEAN - A Modern Stack') meta(property='fb:admins', content='APP_ADMIN') - link(rel='stylesheet', href='/lib/bootstrap/docs/assets/css/bootstrap.css') + link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css') //- link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap-responsive.css') link(rel='stylesheet', href='/css/common.css') diff --git a/app/views/users/auth.jade b/app/views/users/auth.jade index e99b97ccc4..a1f8c2cf45 100755 --- a/app/views/users/auth.jade +++ b/app/views/users/auth.jade @@ -2,7 +2,7 @@ extends ../layouts/default block content .row - .offset1.span5 + .col-md-offset-1.col-md-5 a(href="/auth/facebook") img(src="/img/icons/facebook.png") a(href="/auth/github") @@ -11,7 +11,7 @@ block content img(src="/img/icons/twitter.png") a(href="/auth/google") img(src="/img/icons/google.png") - .span6 + .col-md-6 if message && message.length .fade.in.alert.alert-error button.close(type="button", data-dismiss="alert") × diff --git a/app/views/users/signin.jade b/app/views/users/signin.jade index 92c1731914..9cd9492f9a 100755 --- a/app/views/users/signin.jade +++ b/app/views/users/signin.jade @@ -2,18 +2,19 @@ extends auth block auth form.signin.form-horizontal(action="/users/session", method="post") - .control-group - label.control-label(for='email') Email - .controls - input#email(type='text', name="email", placeholder='Email') + .form-group + label.col-md-4.control-label(for='email') Email + .col-md-8 + input#email.form-control(type='text', name="email", placeholder='Email') - .control-group - label.control-label(for='password') Password - .controls - input#password(type='password', name="password", placeholder='Password') + .form-group + label.col-md-4.control-label(for='password') Password + .col-md-8 + input#password.form-control(type='password', name="password", placeholder='Password') - .form-actions - button.btn.btn-primary(type='submit') Sign in -   - | or  - a.show-signup(href="/signup") Sign up + .form-group + .col-md-offset-4.col-md-8 + button.btn.btn-primary(type='submit') Sign in +   + | or  + a.show-signup(href="/signup") Sign up diff --git a/app/views/users/signup.jade b/app/views/users/signup.jade index b51229bccc..920f0a65cb 100755 --- a/app/views/users/signup.jade +++ b/app/views/users/signup.jade @@ -2,28 +2,29 @@ extends auth block auth form.signup.form-horizontal(action="/users", method="post") - .control-group - label.control-label(for='name') Full name - .controls - input#name(type='text', name="name", placeholder='Full name', value=user.name) + .form-group + label.col-md-4.control-label(for='name') Full Name + .col-md-8 + input#name.form-control(type='text', name="name", placeholder='Full name', value=user.name) - .control-group - label.control-label(for='email') Email - .controls - input#email(type='text', name="email", placeholder='Email', value=user.email) + .form-group + label.col-md-4.control-label(for='email') Email + .col-md-8 + input#email.form-control(type='text', name="email", placeholder='Email', value=user.email) - .control-group - label.control-label(for='username') Username - .controls - input#username(type='text', name="username", placeholder='Username', value=user.username) + .form-group + label.col-md-4.control-label(for='username') Username + .col-md-8 + input#username.form-control(type='text', name="username", placeholder='Username', value=user.username) - .control-group - label.control-label(for='password') Password - .controls - input#password(type='password', name="password", placeholder='Password') + .form-group + label.col-md-4.control-label(for='password') Password + .col-md-8 + input#password.form-control(type='password', name="password", placeholder='Password') - .form-actions - button.btn.btn-primary(type='submit') Sign up -   - | or  - a.show-login(href="/signin") login + .form-group + .col-md-offset-4.col-md-8 + button.btn.btn-primary(type='submit') Sign up +   + | or  + a.show-login(href="/signin") login diff --git a/bower.json b/bower.json index bd268bb689..9432ea5052 100644 --- a/bower.json +++ b/bower.json @@ -1,14 +1,14 @@ { "name": "mean", - "version": "0.1.2", + "version": "0.1.3", "dependencies": { "angular": "latest", "angular-resource": "latest", "angular-cookies": "latest", "angular-mocks": "latest", "angular-route": "latest", - "bootstrap": "2.3.2", - "angular-bootstrap": "0.7.0", - "angular-ui-utils": "0.0.4" + "bootstrap": "latest", + "angular-bootstrap": "latest", + "angular-ui-utils": "latest" } } \ No newline at end of file diff --git a/public/css/common.css b/public/css/common.css index e91ae24026..479e623082 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -4,7 +4,7 @@ } .content { - margin-top:50px; + margin-top:70px; width:100% } diff --git a/public/views/articles/create.html b/public/views/articles/create.html index 222464accd..fca0de4603 100644 --- a/public/views/articles/create.html +++ b/public/views/articles/create.html @@ -1,20 +1,20 @@
-
-
- -
- + +
+ +
+
-
- -
- +
+ +
+
-
-
- +
+
+
diff --git a/public/views/articles/edit.html b/public/views/articles/edit.html index 12d6c2b234..ad70c97462 100644 --- a/public/views/articles/edit.html +++ b/public/views/articles/edit.html @@ -1,24 +1,20 @@
-
-
- - -
- - + +
+ +
+
-
- - -
- +
+ +
+
-
-
- +
+
+
diff --git a/public/views/articles/view.html b/public/views/articles/view.html index 16b76d8b4e..b34b586920 100644 --- a/public/views/articles/view.html +++ b/public/views/articles/view.html @@ -4,10 +4,10 @@

{{article.title}}

{{article.content}}
diff --git a/public/views/header.html b/public/views/header.html index 7567812559..49c0482f8a 100644 --- a/public/views/header.html +++ b/public/views/header.html @@ -1,20 +1,20 @@ -
-