update layout

minineuron · Sep 12, 2012 · 29e2058 · 29e2058
1 parent 9c9506d
commit 29e2058
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/www/app.ms b/www/app.ms
@@ -54,7 +54,6 @@ module.exports = #(server, config) {
     app.set('port', process.env.PORT || 3000);
     app.set('views', __dirname + '/views');
     app.set('view engine', 'jade');
-    app.use(express.favicon());
     app.use(express.logger('dev'));
     app.use(express.bodyParser());
     app.use(express.methodOverride());

diff --git a/www/public/images/shortcut.ico b/www/public/images/shortcut.ico
diff --git a/www/public/stylesheets/style.css b/www/public/stylesheets/style.css
@@ -12,3 +12,7 @@ body.plain {
   display: block;
   text-align: center; 
 }
+.nav-right {
+  padding: 10px 15px;
+  display: block;
+}
diff --git a/www/views/layout.jade b/www/views/layout.jade
@@ -4,7 +4,7 @@ html
     title Upbeat
     link(rel='stylesheet', href='/stylesheets/style.css')
     link(rel='stylesheet', href='/bootstrap/css/bootstrap.min.css')
-    link(rel='icon', href='/images/shortcut.ico')
+    link(rel='icon', href='/images/favicon.ico')
 
     script(src='/javascripts/jquery.js')
     script(src='/bootstrap/js/bootstrap.min.js')
@@ -21,10 +21,10 @@ html
             a.brand(href="/", title="upbeat") 
               img(src="/images/upbeat_small.png")
             .nav-collapse.collapse
+              .pull-right: span.nav-right.text-info= "Uptime: " + process.uptime() + " secs";
               ul.nav
                 li: a(href="/services") Services
                 li: a(href="/stats") Stats
-                li: a(href="#")= "Uptime: " + process.uptime() + " secs";
 
     .container-fluid
       unless query.plain