Merge branch 'develop' of github.com:jeffsu/upbeat into develop

jeffsu · Sep 11, 2012 · 560dd40 · 560dd40
2 parents e67b18a + 5f4db22
commit 560dd40
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/www/public/javascripts/chart-styles.js b/www/public/javascripts/chart-styles.js
@@ -1,6 +1,6 @@
 $.elycharts.templates.upbeat = {
   type : "line",
-  margins : [20, 20, 25, 20],
+  margins : [25, 25, 25, 25],
   tooltips: function (serialId, valueIdx, allValues, singleValue) {
     return Math.round(singleValue);
   },

diff --git a/www/public/stylesheets/style.css b/www/public/stylesheets/style.css
@@ -2,6 +2,11 @@ body {
   padding: 60px;
 }
 
+body.plain {
+  padding: 0px;
+}
+
+
 .chart { height: 300px; }
 .service a { 
   display: block;

diff --git a/www/views/layout.jade b/www/views/layout.jade
@@ -13,19 +13,21 @@ html
     script(src='/javascripts/chart-styles.js')
     script(src='/javascripts/charts.js')
     script(src='/javascripts/jquery.sparkline.min.js')
-  body
-    .navbar.navbar-inverse.navbar-fixed-top
-      .navbar-inner
-        .container
-          a.brand(href="/", title="upbeat") 
-            img(src="/images/upbeat_small.png")
-          .nav-collapse.collapse
-            ul.nav
-              li: a(href="/services") Services
-              li: a(href="/stats") Stats
-              li: a(href="#")= "Uptime: " + process.uptime() + " secs";
+  body(class=query.plain ? 'plain' : '')
+    unless query.plain
+      .navbar.navbar-inverse.navbar-fixed-top
+        .navbar-inner
+          .container
+            a.brand(href="/", title="upbeat") 
+              img(src="/images/upbeat_small.png")
+            .nav-collapse.collapse
+              ul.nav
+                li: a(href="/services") Services
+                li: a(href="/stats") Stats
+                li: a(href="#")= "Uptime: " + process.uptime() + " secs";
 
     .container-fluid
-      block breadcrumbs
-        include _breadcrumbs
+      unless query.plain
+        block breadcrumbs
+          include _breadcrumbs
       block content