From 92f5f8dceda72c67618b34a1a5659a4470be2c29 Mon Sep 17 00:00:00 2001 From: timstanley1985 Date: Sat, 9 Apr 2016 17:09:55 +0100 Subject: [PATCH 1/3] Fix build on RPi. Building from source timesout on karma tests so increase timeouts --- karma.conf.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index dc082924b11..c803dda5eae 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -24,9 +24,10 @@ module.exports = function(config) { logLevel: config.LOG_INFO, autoWatch: true, browsers: ['PhantomJS'], - captureTimeout: 2000, + captureTimeout: 20000, singleRun: true, - autoWatchBatchDelay: 1000, + autoWatchBatchDelay: 10000, + browserNoActivityTimeout: 60000, }); From b6ccd7ffbef0c7b8c0bc95731fce129962e8d03b Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Tue, 12 Apr 2016 15:18:47 -0400 Subject: [PATCH 2/3] Updated background color on div --- public/sass/pages/_login.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/sass/pages/_login.scss b/public/sass/pages/_login.scss index 926e8c21f6c..8f376dfae71 100644 --- a/public/sass/pages/_login.scss +++ b/public/sass/pages/_login.scss @@ -134,7 +134,7 @@ border-bottom: 1px solid $gray-1; .login-divider-text { - background-color: $dark-3; + background-color: $panel-bg; color: $gray-2; padding: 0 10px; } @@ -192,4 +192,3 @@ } } } - From c13ebce2f6c20cea8e69015bf184376bd80c48f3 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Tue, 12 Apr 2016 17:01:30 -0400 Subject: [PATCH 3/3] Update module.html --- public/app/plugins/panel/pluginlist/module.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html index b62dc352b00..d9a52c29ac1 100644 --- a/public/app/plugins/panel/pluginlist/module.html +++ b/public/app/plugins/panel/pluginlist/module.html @@ -22,7 +22,7 @@