From 8819652b58a51bdb655c2ae2016948eee4b91bfc Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Sun, 14 Aug 2011 13:53:11 +0000 Subject: [PATCH] =?UTF-8?q?fix=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B8=20?= =?UTF-8?q?=D1=82=D0=B5=D0=B3=D0=B0=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/skin/developer-jquery/css/topic.css | 2 +- templates/skin/developer-jquery/header.tpl | 2 +- templates/skin/developer-jquery/settings/config/config.php | 2 ++ templates/skin/new-jquery/css/topic.css | 2 +- templates/skin/new-jquery/header.tpl | 2 +- templates/skin/new-jquery/settings/config/config.php | 2 ++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css index 9c434944..2bf32a8d 100644 --- a/templates/skin/developer-jquery/css/topic.css +++ b/templates/skin/developer-jquery/css/topic.css @@ -10,7 +10,7 @@ .topic .content { overflow: hidden; zoom: 1; margin-bottom: 15px; } .topic .content p { margin-bottom: 18px; } .topic .content blockquote { background: #fafafa; padding: 10px 15px; color: #555; margin-bottom: 5px; clear: both; } -.topic .content pre { background: #fafafa; border: 1px solid #dce6f0; margin-bottom: 10px; overflow: auto; padding: 5px 10px; } +.topic .content pre, .comment .content pre { background: #fafafa; border: 1px solid #dce6f0; margin-bottom: 10px; overflow: auto; padding: 5px 10px; } .topic .content ul { list-style-type: disc; margin-left: 17px; } .topic .content ol { list-style-type: decimal; margin-left: 22px; } .topic .content img[align="right"] { margin: 4px 0 5px 15px; } diff --git a/templates/skin/developer-jquery/header.tpl b/templates/skin/developer-jquery/header.tpl index 2b7135ac..7d200cc0 100644 --- a/templates/skin/developer-jquery/header.tpl +++ b/templates/skin/developer-jquery/header.tpl @@ -60,7 +60,7 @@ - + {hook run='body_begin'}
diff --git a/templates/skin/developer-jquery/settings/config/config.php b/templates/skin/developer-jquery/settings/config/config.php index a4ddc3b7..83ff5af9 100644 --- a/templates/skin/developer-jquery/settings/config/config.php +++ b/templates/skin/developer-jquery/settings/config/config.php @@ -12,6 +12,7 @@ $config['head']['default']['js'] = array( "___path.root.engine_lib___/external/jquery/jquery.jqplugin.js", "___path.root.engine_lib___/external/jquery/jquery.cookie.js", "___path.root.engine_lib___/external/jquery/jquery.serializejson.js", + "___path.root.engine_lib___/external/prettify/prettify.js", "___path.static.skin___/js/main.js", "___path.static.skin___/js/favourite.js", "___path.static.skin___/js/blocks.js", @@ -41,6 +42,7 @@ $config['head']['default']['css'] = array( "___path.root.engine_lib___/external/jquery/markitup/skins/simple/style.css", "___path.root.engine_lib___/external/jquery/markitup/sets/default/style.css", "___path.static.skin___/css/smoothness/jquery-ui.css", + "___path.root.engine_lib___/external/prettify/prettify.css", ); /** diff --git a/templates/skin/new-jquery/css/topic.css b/templates/skin/new-jquery/css/topic.css index a7e3367c..5cff26c0 100644 --- a/templates/skin/new-jquery/css/topic.css +++ b/templates/skin/new-jquery/css/topic.css @@ -11,7 +11,7 @@ .topic .content h5 { font-size: 20px; line-height: 1.3em; margin-bottom: 10px; } .topic .content h6 { font-size: 18px; line-height: 1.3em; margin-bottom: 10px; } .topic .content blockquote { background: #fafafa; padding: 10px 15px; color: #555; margin-bottom: 5px; clear: both; } -.topic .content pre { background: url(../images/code.gif); border: 1px solid #dce6f0; overflow: auto; padding: 5px 10px; } +.topic .content pre, .comment .content pre { background: url(../images/code.gif); border: 1px solid #dce6f0; overflow: auto; padding: 5px 10px; margin-right: 10px;} .topic .content ul { list-style-type: disc; margin-left: 17px; } .topic .content ol { list-style-type: decimal; margin-left: 22px; } .topic .content img[align="right"] { margin: 4px 0 5px 15px; } diff --git a/templates/skin/new-jquery/header.tpl b/templates/skin/new-jquery/header.tpl index abaac5d1..867d7818 100644 --- a/templates/skin/new-jquery/header.tpl +++ b/templates/skin/new-jquery/header.tpl @@ -60,7 +60,7 @@ - + {hook run='body_begin'} {include file='header_top.tpl'} {include file='nav.tpl'} diff --git a/templates/skin/new-jquery/settings/config/config.php b/templates/skin/new-jquery/settings/config/config.php index 2b4a58aa..cffc7638 100644 --- a/templates/skin/new-jquery/settings/config/config.php +++ b/templates/skin/new-jquery/settings/config/config.php @@ -12,6 +12,7 @@ $config['head']['default']['js'] = array( "___path.root.engine_lib___/external/jquery/jquery.jqplugin.js", "___path.root.engine_lib___/external/jquery/jquery.cookie.js", "___path.root.engine_lib___/external/jquery/jquery.serializejson.js", + "___path.root.engine_lib___/external/prettify/prettify.js", "___path.static.skin___/js/main.js", "___path.static.skin___/js/favourite.js", "___path.static.skin___/js/blocks.js", @@ -30,6 +31,7 @@ $config['head']['default']['css'] = array( "___path.static.skin___/css/reset.css", "___path.root.engine_lib___/external/jquery/markitup/skins/simple/style.css", "___path.root.engine_lib___/external/jquery/markitup/sets/default/style.css", + "___path.root.engine_lib___/external/prettify/prettify.css", "___path.static.skin___/css/main.css", "___path.static.skin___/css/grid.css", "___path.static.skin___/css/common.css",