From 80e15dd75488e91c55d3c59dbe03ad89d0a07128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 3 Feb 2016 19:41:39 +0100 Subject: [PATCH] feat(css): minor css tweaks --- public/app/plugins/panel/singlestat/controller.ts | 1 - public/less/search.less | 4 ++-- public/less/sidemenu.less | 3 ++- public/less/variables.dark.less | 4 ++++ public/less/variables.light.less | 6 +++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/public/app/plugins/panel/singlestat/controller.ts b/public/app/plugins/panel/singlestat/controller.ts index 6c258283f6c..78b87e5164d 100644 --- a/public/app/plugins/panel/singlestat/controller.ts +++ b/public/app/plugins/panel/singlestat/controller.ts @@ -50,7 +50,6 @@ export class SingleStatCtrl extends MetricsPanelCtrl { _.defaults(this.panel, panelDefaults); } - initEditMode() { super.initEditMode(); this.icon = "fa fa-dashboard"; diff --git a/public/less/search.less b/public/less/search.less index 543273fb27b..d56ce245b32 100644 --- a/public/less/search.less +++ b/public/less/search.less @@ -5,10 +5,10 @@ z-index: 1000; position: absolute; width: 700px; - box-shadow: 0px 0px 55px 0px black; + box-shadow: @searchShadow; padding: 10px; background-color: @grafanaPanelBackground; - border: 1px solid @grafanaTargetFuncBackground; + border: @grafanaPanelBorder; .label-tag { margin-left: 6px; diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less index 76ac0cc892f..d58f5a654cc 100644 --- a/public/less/sidemenu.less +++ b/public/less/sidemenu.less @@ -12,6 +12,7 @@ z-index: 101; transform: translate3d(0, -100%, 0); visibility: hidden; + box-shadow: @sideMenuShadow; a:focus { text-decoration: none; @@ -191,7 +192,7 @@ .sidemenu-org { border-bottom: @sideMenuBorder; - box-shadow: @sideMenuTopShadow; + //box-shadow: @sideMenuTopShadow; padding: 17px 10px 15px 21px; box-sizing: border-box; cursor: pointer; diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less index b22d3b96992..4a989af8c2e 100644 --- a/public/less/variables.dark.less +++ b/public/less/variables.dark.less @@ -163,6 +163,10 @@ @sideMenuBorder: 1px solid @bodyBackground; @sideMenuBackground: @grayDark; @sideMenuBackgroundHighlight: lighten(@grayDark, 4%); +@sideMenuShadow: 0 0 35px 0 @bodyBackground; + +// Search +@searchShadow: 0 0 35px 0 @bodyBackground; // Dropdowns // ------------------------- diff --git a/public/less/variables.light.less b/public/less/variables.light.less index 81d0c81528a..22b661c6adf 100644 --- a/public/less/variables.light.less +++ b/public/less/variables.light.less @@ -177,6 +177,10 @@ @sideMenuBorder: 1px solid @grafanaTargetBorder; @sideMenuBackground: @grafanaPanelBackground; @sideMenuBackgroundHighlight: darken(@sideMenuBackground, 4%); +@sideMenuShadow: 0 5px 30px 0 lighten(@grayLight, 30%); + +// search +@searchShadow: 0 5px 30px 0 lighten(@grayLight, 30%); // Dropdowns // ------------------------- @@ -254,7 +258,7 @@ @navbarLinkColorActive: #555; @navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundActive: darken(@navbarBackground, 6.5%); -@navbarDropdownShadow: inset 0px 4px 10px -4px darken(@bodyBackground, 20%); +@navbarDropdownShadow: inset 0px 4px 7px -4px darken(@bodyBackground, 20%); @navbarBrandColor: @navbarLinkColor;