summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MIT-LICENSE2
-rw-r--r--README.md4
-rw-r--r--lib/dashing/app.rb2
-rw-r--r--templates/project/widgets/graph/graph.coffee1
-rw-r--r--test/app_test.rb1
5 files changed, 6 insertions, 4 deletions
diff --git a/MIT-LICENSE b/MIT-LICENSE
index 1cb4835..f85bef7 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Shopify
+Copyright (c) 2015 Shopify
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index 01010e0..4aee91f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# [Dashing](http://shopify.github.com/dashing)
-![](https://api.travis-ci.org/Shopify/dashing.png)
+[![Build Status](https://secure.travis-ci.org/Shopify/dashing.png?branch=master)](http://travis-ci.org/Shopify/dashing)
Dashing is a Sinatra based framework that lets you build beautiful dashboards. It looks especially great on TVs.
[Check out the homepage](http://shopify.github.com/dashing).
# License
-Distributed under the [MIT license](https://github.com/Shopify/dashing/blob/master/MIT-LICENSE)
+Distributed under the [MIT license](MIT-LICENSE)
diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb
index 921bf9c..0e7f7bb 100644
--- a/lib/dashing/app.rb
+++ b/lib/dashing/app.rb
@@ -50,7 +50,7 @@ end
end
not_found do
- send_file File.join(settings.public_folder, '404.html')
+ send_file File.join(settings.public_folder, '404.html'), status: 404
end
at_exit do
diff --git a/templates/project/widgets/graph/graph.coffee b/templates/project/widgets/graph/graph.coffee
index 28ce88e..5d6b9ab 100644
--- a/templates/project/widgets/graph/graph.coffee
+++ b/templates/project/widgets/graph/graph.coffee
@@ -22,6 +22,7 @@ class Dashing.Graph extends Dashing.Widget
data: [{x:0, y:0}]
}
]
+ padding: {top: 0.02, left: 0.02, right: 0.02, bottom: 0.02}
)
@graph.series[0].data = @get('points') if @get('points')
diff --git a/test/app_test.rb b/test/app_test.rb
index 4101e91..36cd310 100644
--- a/test/app_test.rb
+++ b/test/app_test.rb
@@ -145,6 +145,7 @@ class AppTest < Dashing::Test
cli.stubs(:source_paths).returns([source_path])
silent { cli.new 'new_project' }
+ app.settings.public_folder = File.join(dir, 'new_project/public')
app.settings.views = File.join(dir, 'new_project/dashboards')
app.settings.root = File.join(dir, 'new_project')
yield app.settings.root