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, }); 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 @@
- + No additional panels installed. Browse Grafana.net
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 @@ } } } -