# HG changeset patch # User domruf # Date 2017-10-26 23:03:07 # Node ID 13b202c88e41b4ea497811f714284fe2dc50ffdc # Parent 99f81d23ea20d7a9e424e05d30b182f9b88e9c5a less: only override Bootstrap default styling of pre where it really is needed Bootstrap changes the styling of pre, even without special classes. Thus, override the bootstrap default styling in a less broad manner. The only thing that really needs to be changed is the border, margin, padding and the background for the code diffs. diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -10,21 +10,6 @@ body { background: url("../images/background.png") repeat scroll 0 0 #B0B0B0; } -/* Undo unfortunate Bootstrap default styling */ -body pre { - display: inherit; - padding: inherit; - margin: inherit; - font-size: inherit; - line-height: inherit; - color: inherit; - word-break: inherit; - word-wrap: inherit; - background-color: inherit; - border: inherit; - border-radius: inherit; - overflow: inherit; -} a { color: #577632; text-decoration: none; @@ -109,6 +94,12 @@ nav.navbar { margin-bottom: -4px; margin-top: -12px; } +/* code highlighting */ +/* don't use bootstrap style for code blocks */ +.code-highlighttable pre { + background: inherit; + border: 0; +} /* every direct child of a panel, that is not .panel-heading, should auto * overflow to prevent overflowing of elements like text boxes and tables */ .panel > :not(.panel-heading) { @@ -1639,6 +1630,10 @@ BIN_FILENODE = 6 display: block; } .code-difftable .code pre { + border: 0; + padding: 0; + margin: 0; + background: none; min-height: 17px; line-height: 17px; white-space: pre-wrap; diff --git a/kallithea/public/less/kallithea-diff.less b/kallithea/public/less/kallithea-diff.less --- a/kallithea/public/less/kallithea-diff.less +++ b/kallithea/public/less/kallithea-diff.less @@ -158,6 +158,10 @@ BIN_FILENODE = 6 display: block; } .code pre { + border: 0; + padding: 0; + margin: 0; + background: none; min-height: 17px; line-height: 17px; white-space: pre-wrap; diff --git a/kallithea/public/less/style.less b/kallithea/public/less/style.less --- a/kallithea/public/less/style.less +++ b/kallithea/public/less/style.less @@ -13,21 +13,6 @@ body { background: url("../images/background.png") repeat scroll 0 0 #B0B0B0; } -/* Undo unfortunate Bootstrap default styling */ -body pre { - display: inherit; - padding: inherit; - margin: inherit; - font-size: inherit; - line-height: inherit; - color: inherit; - word-break: inherit; - word-wrap: inherit; - background-color: inherit; - border: inherit; - border-radius: inherit; - overflow: inherit; -} a { color: #577632; @@ -123,6 +108,13 @@ nav.navbar { } } +/* code highlighting */ +/* don't use bootstrap style for code blocks */ +.code-highlighttable pre { + background: inherit; + border: 0; +} + /* every direct child of a panel, that is not .panel-heading, should auto * overflow to prevent overflowing of elements like text boxes and tables */ .panel > :not(.panel-heading){