diff --git a/controllers/users.js b/controllers/users.js index e7e1724273..d278e6d7e1 100644 --- a/controllers/users.js +++ b/controllers/users.js @@ -16,10 +16,10 @@ exports.admin = function(req, res) { exports.postlogin = function(req, res, next) { passport.authenticate('local', function(err, user, info) { - if (err) { return next(err) } + if (err) return next(err); if (!user) { req.session.messages = [info.message]; - return res.redirect('/login') + return res.redirect('/login'); } req.logIn(user, function(err) { if (err) { return next(err); } diff --git a/public/css/app.css b/public/css/app.css index 9369536040..e7c477f9cb 100755 --- a/public/css/app.css +++ b/public/css/app.css @@ -1,8 +1,21 @@ -/* app css stylesheet */ - body { - padding-top:70px; + padding-top: 70px; } +.btn-label { + position: relative; + left: -12px; + display: inline-block; + padding: 6px 12px; + background: rgba(0, 0, 0, 0.15); + border-radius: 3px 0 0 3px; +} - \ No newline at end of file +.btn-labeled { + padding-top: 0; + padding-bottom: 0; +} + +.btn { + margin-bottom: 10px; +} \ No newline at end of file diff --git a/views/index.jade b/views/index.jade index a39f2c7cfb..79870d4afe 100644 --- a/views/index.jade +++ b/views/index.jade @@ -27,6 +27,59 @@ block body .jumbotron h1 Hello {{name}} div(ng-view) + br + button.btn.btn-labeled.btn-success(type='button') + span.btn-label + i.glyphicon.glyphicon-ok + | Success + br + button.btn.btn-labeled.btn-danger(type='button') + span.btn-label + i.glyphicon.glyphicon-remove + | Cancel + br + button.btn.btn-labeled.btn-warning(type='button') + span.btn-label + i.glyphicon.glyphicon-bookmark + | Bookmark + br + button.btn.btn-labeled.btn-primary(type='button') + span.btn-label + i.glyphicon.glyphicon-camera + | Camera + br + button.btn.btn-labeled.btn-default(type='button') + span.btn-label + i.glyphicon.glyphicon-chevron-left + | Left + br + button.btn.btn-labeled.btn-default(type='button') + span.btn-label + i.glyphicon.glyphicon-chevron-right + | Right + br + button.btn.btn-labeled.btn-success(type='button') + span.btn-label + i.glyphicon.glyphicon-thumbs-up + | Thumbs + | Up + br + button.btn.btn-labeled.btn-danger(type='button') + span.btn-label + i.glyphicon.glyphicon-thumbs-down + | Thumbs + | Down + br + button.btn.btn-labeled.btn-info(type='button') + span.btn-label + i.glyphicon.glyphicon-refresh + | Refresh + br + button.btn.btn-labeled.btn-danger(type='button') + span.btn-label + i.glyphicon.glyphicon-trash + | Trash + hr div | Angular seed app: v