From e31b5554e19b288f668677d42b56b5ce7d01d5e7 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sat, 3 Mar 2012 17:38:29 +0530
Subject: [PATCH] attempt to solve line height problem through a solution that
 contains no logic whatsoever

---
 edgware/editor/models.py                | 2 +-
 edgware/editor/views.py                 | 1 -
 edgware/static/css/articleDemo.css      | 1 +
 edgware/static/css/editor.css           | 7 ++++---
 edgware/templates/article_frontend.html | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/edgware/editor/models.py b/edgware/editor/models.py
index ff910ee..33f504e 100644
--- a/edgware/editor/models.py
+++ b/edgware/editor/models.py
@@ -157,7 +157,7 @@ class Revision(models.Model):
   prop = models.CharField(max_length=100)
   old_val = models.TextField()
   new_val = models.TextField()
-  uuid = models.IntegerField()
+  uuid = models.IntegerField(db_index=True)
 
 def saveRevision(r):
   page = Page.objects.get(pk=r['page_id'])
diff --git a/edgware/editor/views.py b/edgware/editor/views.py
index 6721677..f4f6cba 100644
--- a/edgware/editor/views.py
+++ b/edgware/editor/views.py
@@ -1,4 +1,3 @@
-
 from models import *
 from files.models import *
 from django.http import HttpResponse, HttpResponseRedirect
diff --git a/edgware/static/css/articleDemo.css b/edgware/static/css/articleDemo.css
index dbbe255..0ad041e 100644
--- a/edgware/static/css/articleDemo.css
+++ b/edgware/static/css/articleDemo.css
@@ -418,6 +418,7 @@ h5 {
 
 body {
   font-family: "DejaVu Sans", Arial, Verdana, sans-serif;
+/*  font-family: Helvetica, sans-serif; */
   background: #aaa;
 /*  background-image: -moz-linear-gradient(left top, #ABAE71, #CDD535, #F4F6C7);
   background-image: -webkit-gradient(radial, 45px 45px 45deg, circle cover,
diff --git a/edgware/static/css/editor.css b/edgware/static/css/editor.css
index 0cd2fef..6a26869 100644
--- a/edgware/static/css/editor.css
+++ b/edgware/static/css/editor.css
@@ -12,6 +12,7 @@ body {
 }
 
 p {
+  line-height: 1;
   padding: 0px;
   margin: 0px;
 }
@@ -326,12 +327,12 @@ p {
 	margin-top:0px;
 }
 
-.textbox_canvas_content * {
+.textbox_canvas_text {
 margin-top:0px;
 }
 
-.textbox_canvas_text {
-margin-top:0px;
+.textbox_canvas_text * {
+    margin-top: 0px;
 }
 
 .save_text{
diff --git a/edgware/templates/article_frontend.html b/edgware/templates/article_frontend.html
index fcfea78..9087402 100644
--- a/edgware/templates/article_frontend.html
+++ b/edgware/templates/article_frontend.html
@@ -20,6 +20,7 @@ body, html {
 
 
 p {
+  line-height: 100%;
   padding: 0px;
   margin: 0px;
 }