IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-01 10:57:17 -07:00
commit bcc875a39c
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/sass/_grafana.scss
View File

@ -17,6 +17,7 @@
@import "base/grid"; @import "base/grid";
@import "base/font_awesome"; @import "base/font_awesome";
@import "base/grafana_icons"; @import "base/grafana_icons";
@import "base/code";
// UTILS // UTILS
@import "utils/utils"; @import "utils/utils";

14
public/sass/base/_code.scss
View File

@ -11,28 +11,28 @@ pre {
background-color: $code-tag-bg; background-color: $code-tag-bg;
color: $text-color; color: $text-color;
border: 1px solid darken($code-tag-bg, 15%); border: 1px solid darken($code-tag-bg, 15%);
padding: 2px; padding: 10px;
border-radius: 4px;
} }
// Inline code // Inline code
code { code {
color: #d14; color: $text-color;
background-color: #f7f7f9; background-color: $code-tag-bg;
border: 1px solid #e1e1e8; border: 1px solid darken($code-tag-bg, 15%);
white-space: nowrap; white-space: nowrap;
} }
// Blocks of code // Blocks of code
pre { pre {
display: block; display: block;
margin: 0 0 $line-height-base / 2; margin: 0 0 $line-height-base;
font-size: $font-size-base - 1; // 14px to 13px
line-height: $line-height-base; line-height: $line-height-base;
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
background-color: #f5f5f5; background-color: $code-tag-bg;
// Make prettyprint styles more spaced out for readability // Make prettyprint styles more spaced out for readability
&.prettyprint { &.prettyprint {