From e7fe0bd668e653bbf590004c209fa34f724efc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 6 Dec 2018 12:29:55 -0800 Subject: [PATCH] fixed unit tests --- public/app/core/config.ts | 6 +++++- public/sass/components/_panel_logs.scss | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/app/core/config.ts b/public/app/core/config.ts index 1473f8a91f8..13d84772ecf 100644 --- a/public/app/core/config.ts +++ b/public/app/core/config.ts @@ -54,7 +54,11 @@ export class Settings { } } -const bootData = (window as any).grafanaBootData || { settings: {} }; +const bootData = (window as any).grafanaBootData || { + settings: {}, + user: {}, +}; + const options = bootData.settings; options.bootData = bootData; diff --git a/public/sass/components/_panel_logs.scss b/public/sass/components/_panel_logs.scss index f1a2a32af2c..6f1c43cfe1d 100644 --- a/public/sass/components/_panel_logs.scss +++ b/public/sass/components/_panel_logs.scss @@ -78,6 +78,7 @@ $column-horizontal-spacing: 10px; .logs-row__labels { max-width: 20%; + line-height: 1.2; } .logs-row__message { @@ -189,10 +190,6 @@ $column-horizontal-spacing: 10px; box-shadow: $popover-shadow; } -.logs-row__labels { - line-height: 1.2; -} - .logs-stats__info { margin-bottom: $spacer / 2; }