From 6b6b1020795f859e01f66b9f6c5289a095039e5f Mon Sep 17 00:00:00 2001 From: Trent White Date: Fri, 31 Jul 2015 15:51:31 -0400 Subject: [PATCH] updated some hard-coded colors to variables so they work well on light theme --- public/css/less/gfbox.less | 2 +- public/css/less/grafana.less | 4 ++-- public/css/less/variables.light.less | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/css/less/gfbox.less b/public/css/less/gfbox.less index 8f4469b1390..90bb3ccb36a 100644 --- a/public/css/less/gfbox.less +++ b/public/css/less/gfbox.less @@ -65,7 +65,7 @@ margin: 15px; background: @grafanaPanelBackground; position: relative; - border: 1px solid @grayDark; + border: @grafanaPanelBorder; padding: 20px 20px 60px 49px; h2 { diff --git a/public/css/less/grafana.less b/public/css/less/grafana.less index 681702315c0..ec9641db1c4 100644 --- a/public/css/less/grafana.less +++ b/public/css/less/grafana.less @@ -184,11 +184,11 @@ position : absolute; top: -1000; left: 0; - color: #c8c8c8; + color: @tooltipColor; padding: 10px; font-size: 11pt; font-weight : 200; - background-color: rgb(58, 57, 57); + background-color: @tooltipBackground; border-radius: 5px; z-index: 9999; max-width: 800px; diff --git a/public/css/less/variables.light.less b/public/css/less/variables.light.less index ab04ca01585..140e0be3341 100644 --- a/public/css/less/variables.light.less +++ b/public/css/less/variables.light.less @@ -112,6 +112,7 @@ @grafanaListMainLinkColor: @textColor; + // Tables // ------------------------- @tableBackground: transparent; // overall background-color @@ -145,8 +146,8 @@ @btnDangerBackground: lighten(@red, 5%); @btnDangerBackgroundHighlight: darken(@red, 5%); -@btnInverseBackground: @gray; -@btnInverseBackgroundHighlight: darken(@gray, 10%); +@btnInverseBackground: @white; +@btnInverseBackgroundHighlight: darken(@grayLight, 15%); @iconContainerBackground: @white; @iconContainerBackgroundHighlight: lighten(@white, 5%); @@ -296,8 +297,8 @@ // Tooltips and popovers // ------------------------- -@tooltipColor: #fff; -@tooltipBackground: #333; +@tooltipColor: @grayDark; +@tooltipBackground: darken(@white,3%); @tooltipArrowWidth: 5px; @tooltipArrowColor: @tooltipBackground; @tooltipLinkColor: darken(@white,11%);