From 9be1ffd6337ca50d6b0b5beb505e818c2122d92d Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Mon, 28 Mar 2016 18:37:02 -0400 Subject: [PATCH 1/2] Fixed code blocks in Grafana --- public/sass/_grafana.scss | 2 ++ public/sass/base/_code.scss | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index c7b4567bfb5..2adada88ce1 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -17,6 +17,8 @@ @import "base/grid"; @import "base/font_awesome"; @import "base/grafana_icons"; +@import "base/code"; + // UTILS @import "utils/utils"; diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss index db7a8cfab18..2a4057a8547 100644 --- a/public/sass/base/_code.scss +++ b/public/sass/base/_code.scss @@ -11,28 +11,28 @@ pre { background-color: $code-tag-bg; color: $text-color; border: 1px solid darken($code-tag-bg, 15%); - padding: 2px; + padding: 10px; + border-radius: 4px; } // Inline code code { - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; + color: $text-color; + background-color: $code-tag-bg; + border: 1px solid darken($code-tag-bg, 15%); white-space: nowrap; } // Blocks of code pre { display: block; - margin: 0 0 $line-height-base / 2; - font-size: $font-size-base - 1; // 14px to 13px + margin: 0 0 $line-height-base; line-height: $line-height-base; word-break: break-all; word-wrap: break-word; white-space: pre; white-space: pre-wrap; - background-color: #f5f5f5; + background-color: $code-tag-bg; // Make prettyprint styles more spaced out for readability &.prettyprint { From ef89dabb61cef108aad2c9baca33068e81483af1 Mon Sep 17 00:00:00 2001 From: Matt Toback Date: Mon, 28 Mar 2016 18:37:52 -0400 Subject: [PATCH 2/2] Go away extra line --- public/sass/_grafana.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss index 2adada88ce1..900d0c00f80 100644 --- a/public/sass/_grafana.scss +++ b/public/sass/_grafana.scss @@ -19,7 +19,6 @@ @import "base/grafana_icons"; @import "base/code"; - // UTILS @import "utils/utils"; @import "utils/validation";