From f0f161045c0633b7cd37dfa2b7f44226e3ce4cb7 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sat, 3 Mar 2012 20:17:27 +0530
Subject: [PATCH] line-height bug seems really fixed - removed inconsistencies

---
 edgware/static/css/editor.css           | 15 ++++++++++++---
 edgware/templates/article_frontend.html |  4 +++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/edgware/static/css/editor.css b/edgware/static/css/editor.css
index 33f4d6c..d062bbf 100644
--- a/edgware/static/css/editor.css
+++ b/edgware/static/css/editor.css
@@ -17,6 +17,12 @@ p {
   margin: 0px;
 }
 
+p span {
+    padding: 0px;
+    margin: 0px;
+    line-height: 100%;
+}
+
 #ajaxBusy {
   position: fixed;
   top: 16px;
@@ -310,19 +316,21 @@ p {
   text-decoration:none;
 }
 
+/*
 .textbox_canvas {
   width:100%;
   height:100%;
 }
-
+*/
 .imagebox_canvas {
 	
 }
-
+/*
 .textbox_canvas_content {
   height:100%;
 }
-
+*/
+/*
 .textbox_canvas_content {
 	margin-top:0px;
 }
@@ -334,6 +342,7 @@ margin-top:0px;
 .textbox_canvas_text * {
     margin-top: 0px;
 }
+*/
 
 .save_text{
   margin-top:30px;
diff --git a/edgware/templates/article_frontend.html b/edgware/templates/article_frontend.html
index 9087402..f469952 100644
--- a/edgware/templates/article_frontend.html
+++ b/edgware/templates/article_frontend.html
@@ -10,7 +10,7 @@
 <link href="/static/css/articleDemo.css" rel="stylesheet" type="text/css" />
 <style type="text/css">
 
-.style1 {font-size: 16px}
+.style1 {font-size: 16px;}
 
 body, html {
   font-size: {{ "14px"|make_really_big:m }};
@@ -32,6 +32,7 @@ p {
   width: {{width}};
   }
 
+/*
 .textbox_canvas_text * {
   margin-top: 0px;
 }
@@ -39,6 +40,7 @@ p {
 .textbox_canvas_text {
   margin-top: 0px;
 }
+*/
 
 .box {
   position: absolute;