From f7da9a6a166c020d740d9280ffb578167c46ed38 Mon Sep 17 00:00:00 2001 From: Sanj Date: Sun, 4 Mar 2012 12:01:35 +0530 Subject: [PATCH] customck css --- edgware/editor/views.py | 4 ++-- edgware/static/ckeditor/config.js | 2 ++ edgware/static/css/customck.css | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/edgware/editor/views.py b/edgware/editor/views.py index f4f6cba..0d52f49 100644 --- a/edgware/editor/views.py +++ b/edgware/editor/views.py @@ -349,7 +349,7 @@ def imagebox_resize(request): 'width': box.width, 'height': box.height }) - box.resize(width, height) +# box.resize(width, height) box.set_css('width', width) box.set_css('height', height) box.save() @@ -361,7 +361,7 @@ def imagebox_resize(request): 'prop': 'image_resize', 'old_val': old_value, 'new_val': json.dumps({ - 'path': box.get_path(), + 'path': resizedPath, 'width': width, 'height': height }), diff --git a/edgware/static/ckeditor/config.js b/edgware/static/ckeditor/config.js index 304dbdb..c2c6bf9 100755 --- a/edgware/static/ckeditor/config.js +++ b/edgware/static/ckeditor/config.js @@ -23,3 +23,5 @@ CKEDITOR.editorConfig = function( config ) // config.language = 'fr'; // config.uiColor = '#AADC6E'; }; + + diff --git a/edgware/static/css/customck.css b/edgware/static/css/customck.css index 96b7a7b..27769e9 100644 --- a/edgware/static/css/customck.css +++ b/edgware/static/css/customck.css @@ -6,8 +6,9 @@ body, html { } p, p * { - padding: 0; - margin-top: 0px; + line-height: 100%; + padding: 0px; + margin: 0px; }