Merge branch 'master' into bugfix/make-host-customvars-accessible-from-service-objects-10304

This commit is contained in:
Johannes Meyer 2015-10-05 14:09:10 +02:00
commit b582146def
2 changed files with 2 additions and 1 deletions

View File

@ -3,9 +3,11 @@
p.plugin-output { p.plugin-output {
.text-small(); .text-small();
font-family: @font-family-fixed; font-family: @font-family-fixed;
line-height: @line-height-small;
} }
pre.plugin-output { pre.plugin-output {
.text-small(); .text-small();
line-height: @line-height-small;
white-space: pre-wrap; white-space: pre-wrap;
} }

View File

@ -35,7 +35,6 @@ body {
color: @text-color; color: @text-color;
font-family: @font-family; font-family: @font-family;
font-size: @font-size; font-size: @font-size;
line-height: @line-height;
} }
h1 { h1 {