From 78b90cb3cd74503872dec13cf65ade7c6a1fbe2a Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 7 Feb 2013 07:50:59 +0000 Subject: [PATCH] Issue 2913 fixed. Unload file 'style.css' problem solved. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12721 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- layouts/bootstrap.layout/bootstrap.layout.css | 1 + layouts/bootstrap.layout/bootstrap.layout.js | 3 --- modules/editor/styles/default/style.css | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/layouts/bootstrap.layout/bootstrap.layout.css b/layouts/bootstrap.layout/bootstrap.layout.css index 1e7ecc336..e384fe6ac 100644 --- a/layouts/bootstrap.layout/bootstrap.layout.css +++ b/layouts/bootstrap.layout/bootstrap.layout.css @@ -16,6 +16,7 @@ h3{font-size:18px} h4{font-size:14px} h5{font-size:12px} h6{font-size:12px;color:#666;text-transform:none} +blockquote p{font-size:inherit} /* Common */ input[type=checkbox], input[type=radio]{margin:0} diff --git a/layouts/bootstrap.layout/bootstrap.layout.js b/layouts/bootstrap.layout/bootstrap.layout.js index fc95108b5..4770671ad 100644 --- a/layouts/bootstrap.layout/bootstrap.layout.js +++ b/layouts/bootstrap.layout/bootstrap.layout.js @@ -1,7 +1,4 @@ jQuery(function($){ -// Remove content CSS /modules/editor/styles/ - $('head>link[href*="/modules/editor/styles/"]').remove(); - // Skip to content $('.skip>a').click(function(){ $($(this).attr('href')).attr('tabindex','0').focus(); diff --git a/modules/editor/styles/default/style.css b/modules/editor/styles/default/style.css index 6072cfa93..d48a19630 100755 --- a/modules/editor/styles/default/style.css +++ b/modules/editor/styles/default/style.css @@ -16,3 +16,4 @@ .xe_content blockquote.q6{border:1px dashed #707070} .xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb} .xe_content p{margin:0} +