diff options
| -rw-r--r-- | public/css/signin.css | 3 | ||||
| -rw-r--r-- | public/css/signin.less | 1 | ||||
| -rw-r--r-- | routes/sessions.coffee | 2 | ||||
| -rw-r--r-- | views/layout.html | 30 | ||||
| -rw-r--r-- | views/sessions/new.html | 10 |
5 files changed, 24 insertions, 22 deletions
diff --git a/public/css/signin.css b/public/css/signin.css index fe3067e8..22cf7625 100644 --- a/public/css/signin.css +++ b/public/css/signin.css @@ -1,3 +1,6 @@ +#main-logo { + margin-bottom: 15px; +} .form-signin { max-width: 330px; margin-bottom: 10px; diff --git a/public/css/signin.less b/public/css/signin.less index 4a99132c..1aaded62 100644 --- a/public/css/signin.less +++ b/public/css/signin.less @@ -1,3 +1,4 @@ +#main-logo { margin-bottom: 15px; } .form-signin { max-width: 330px; margin-bottom: 10px; diff --git a/routes/sessions.coffee b/routes/sessions.coffee index 775c52ac..6c7de7cf 100644 --- a/routes/sessions.coffee +++ b/routes/sessions.coffee @@ -1,6 +1,6 @@ module.exports = (passport) -> new: (req, res) -> - res.render('sessions/new') + res.render('sessions/new', layout: ') create: (req, res, next) -> passport.authenticate('local', (err, user, info) -> diff --git a/views/layout.html b/views/layout.html index 7d1ea7fa..4b3ad9d4 100644 --- a/views/layout.html +++ b/views/layout.html @@ -11,24 +11,24 @@ <body> <div class="container-fluid"> <nav class="navbar" role="navigation"> - <button type="button" class="btn btn-primary navbar-toggle" data-toggle="collapse" data-target="#nav"> - <span class="glyphicon glyphicon-list"></span> - </button> - <div id="nav" class="collapse navbar-collapse"> - <div class="navbar"> - <ul class="nav navbar-nav"> - <!-- - <li><a href="{{user}}/edit"><span class="glyphicon glyphicon-user"></span> Profile</a></li> + <button type="button" class="btn btn-primary navbar-toggle" data-toggle="collapse" data-target="#nav"> + <span class="glyphicon glyphicon-list"></span> + </button> + <div id="nav" class="collapse navbar-collapse"> + <div class="navbar"> + <ul class="nav navbar-nav"> + <!-- + <li><a href="{{user}}/edit"><span class="glyphicon glyphicon-user"></span> Profile</a></li> --> - <li><a href="/{{user}}"><span class="glyphicon glyphicon-home"></span> Home</a></li> - <li><a href="/{{user}}/edit"><span class="glyphicon glyphicon-cog"></span> Settings</a></li> - <li><a href="/{{user}}/report"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li> - <!-- - <li><a href="/help"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li> + <li><a href="/{{user}}"><span class="glyphicon glyphicon-home"></span> Home</a></li> + <li><a href="/{{user}}/edit"><span class="glyphicon glyphicon-cog"></span> Settings</a></li> + <li><a href="/{{user}}/report"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li> + <!-- + <li><a href="/help"><span class="glyphicon glyphicon-info-sign"></span> Help</a></li> --> - </ul> - </div> + </ul> </div> + </div> </nav> {{{yield}}} diff --git a/views/sessions/new.html b/views/sessions/new.html index 44152995..94eec9ac 100644 --- a/views/sessions/new.html +++ b/views/sessions/new.html @@ -3,13 +3,11 @@ <head> <meta charset="utf-8" /> <meta name="viewport" content="width=480, height=752, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" /> - <title>CoinOS Bitcoin Payment Calculator</title> + <title>CoinOS</title> <link href="img/favicon.ico?v2" rel="shortcut icon" /> - {{#css}}calculator{{/css}} - {{#css}}signin{{/css}} - {{#js}}modernizr-2.6.2-respond-1.1.0.min.js{{/js}} - <style> -</style> + <link rel='stylesheet' href='/css/calculator.css'> + <link rel='stylesheet' href='/css/signin.css'> + <script src='modernizr-2.6.2-respond-1.1.0.min.js'></script> </head> <body> <div class="container-fluid"> |