From ab33cfd7c8b6357ea09a67d56f7d2b7d28f0d364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 3 Dec 2018 03:31:55 -0800 Subject: [PATCH] minor css fixes --- public/app/features/plugins/plugin_component.ts | 2 +- public/sass/components/_panel_editor.scss | 7 +++---- public/sass/pages/_dashboard.scss | 4 ---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/public/app/features/plugins/plugin_component.ts b/public/app/features/plugins/plugin_component.ts index ff964f6ed4c..7092608085d 100644 --- a/public/app/features/plugins/plugin_component.ts +++ b/public/app/features/plugins/plugin_component.ts @@ -93,7 +93,7 @@ function pluginDirectiveLoader($compile, datasourceSrv, $rootScope, $q, $http, $ PanelCtrl.templatePromise = getTemplate(PanelCtrl).then(template => { PanelCtrl.templateUrl = null; - PanelCtrl.template = `${template}`; + PanelCtrl.template = `${template}`; return componentInfo; }); diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss index 8d5e52fa60b..f2286991a9c 100644 --- a/public/sass/components/_panel_editor.scss +++ b/public/sass/components/_panel_editor.scss @@ -8,8 +8,7 @@ height: 100%; &--edit { - flex: 1 1 0; - height: unset; + height: 40%; margin: 0 $dashboard-padding; } @@ -25,7 +24,7 @@ margin-top: $panel-margin*2; display: flex; flex-direction: row; - height: 60%; + flex: 1 1 0; position: relative; } @@ -235,8 +234,8 @@ .gicon { height: 44px; width: 53px; - transition: transform 0.1s ease; margin-right: 5px; + transition: transform 0.1s ease 0.1s; &:hover { filter: $panel-editor-side-menu-shadow; diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss index dbbfe48c828..a005b0386a3 100644 --- a/public/sass/pages/_dashboard.scss +++ b/public/sass/pages/_dashboard.scss @@ -3,10 +3,6 @@ width: 100%; height: 100%; box-sizing: border-box; - - &--has-submenu { - height: calc(100% - 50px); - } } .template-variable {