From c9e4069f2c3ab11320a9047d09145645d4f3071f Mon Sep 17 00:00:00 2001 From: James Taylor Date: Wed, 11 Sep 2013 15:47:26 -0400 Subject: [PATCH] style: do not word wrap in pre blocks --- lib/galaxy/__init__.py | 4 +++- static/style/blue/base.css | 1 + .../style/src/less/galaxy_bootstrap/overrides.less | 14 +++++++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/__init__.py b/lib/galaxy/__init__.py index 36cd328f48c..a40baea2ce0 100644 --- a/lib/galaxy/__init__.py +++ b/lib/galaxy/__init__.py @@ -106,4 +106,6 @@ if not hasattr( logging, 'NullHandler' ): class NullHandler( logging.Handler ): def emit( self, record ): pass - logging.NullHandler = NullHandler \ No newline at end of file + logging.NullHandler = NullHandler + +import galaxy.eggs \ No newline at end of file diff --git a/static/style/blue/base.css b/static/style/blue/base.css index eba84e778d4..7e1381708b9 100644 --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -752,6 +752,7 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0} .affix{position:fixed} .navbar-fixed-top .navbar-brand{font-family:Verdana;font-weight:bold;font-size:160%} +pre{overflow:auto;word-wrap:normal;white-space:pre} .btn.active,.btn:active{color:inherit} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} diff --git a/static/style/src/less/galaxy_bootstrap/overrides.less b/static/style/src/less/galaxy_bootstrap/overrides.less index 2a46b7e3030..d904a6be7a5 100644 --- a/static/style/src/less/galaxy_bootstrap/overrides.less +++ b/static/style/src/less/galaxy_bootstrap/overrides.less @@ -1,9 +1,17 @@ .navbar-fixed-top .navbar-brand { - font-family: Verdana; - font-weight: bold; - font-size: 160%; + font-family: Verdana; + font-weight: bold; + font-size: 160%; } +// Don't wrap text inside pre +pre { + overflow: auto; + word-wrap: normal; + white-space: pre; +} + + .btn.hover { @btn:hover(); }