From 614b26fff6b340eb8e7272a97d0a697c15ed12e2 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 15 Apr 2016 14:58:20 -0400 Subject: [PATCH 1/2] Fixed inline code styles and increase line heights in lists to accommodate code --- public/sass/base/_code.scss | 6 ++---- public/sass/components/_panel_text.scss | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss index eb085c0577c..4222c652193 100644 --- a/public/sass/base/_code.scss +++ b/public/sass/base/_code.scss @@ -21,6 +21,8 @@ code { background-color: $code-tag-bg; border: 1px solid darken($code-tag-bg, 15%); white-space: nowrap; + padding: 2px 5px; + margin: 0 2px; } code.code--small { @@ -29,10 +31,6 @@ code.code--small { margin: 0 2px; } -p.code--line { - line-height: 1.8; -} - // Blocks of code pre { display: block; diff --git a/public/sass/components/_panel_text.scss b/public/sass/components/_panel_text.scss index 06d3495aaa0..9de31bab4c8 100644 --- a/public/sass/components/_panel_text.scss +++ b/public/sass/components/_panel_text.scss @@ -3,4 +3,5 @@ ul { margin: 0 0 $spacer $spacer * 1.5; } + li {line-height: 2;} } From 151d8db98d1c860a8f85433c7663e05f86532857 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Fri, 15 Apr 2016 15:00:29 -0400 Subject: [PATCH 2/2] removed unnecessary style --- public/app/features/plugins/partials/update_instructions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/plugins/partials/update_instructions.html b/public/app/features/plugins/partials/update_instructions.html index 80e3a413d1d..55455e24af7 100644 --- a/public/app/features/plugins/partials/update_instructions.html +++ b/public/app/features/plugins/partials/update_instructions.html @@ -16,6 +16,6 @@
grafana-cli plugins update {{plugin.id}}
Check out {{plugin.name}} on Grafana.net for README and changelog. If you do not have access to the command line, ask your Grafana administator. -

Pro tip: To update all plugins at once, type grafana-cli plugins update-all on the command line. +

Pro tip: To update all plugins at once, type grafana-cli plugins update-all on the command line.