[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit f0fa84f3039686099a70c53698ea3e1e3eab3d45
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 25 22:53:22 2002 +0000

    	Floated images using "align" should have margins to prevent the text from running right
    	up against them.  Matches IE and Mozilla behavior.
    
            * khtml/css/html4.css:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 640f6eb..3d4cbe6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
+	Floated images using "align" should have margins to prevent the text from running right
+	up against them.  Matches IE and Mozilla behavior.
+	
+        * khtml/css/html4.css:
+
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
 	Fix <blockquote> tags to have top and bottom margins of 1em.  This matches the <blockquote>
 	behavior in Gecko.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 640f6eb..3d4cbe6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
+	Floated images using "align" should have margins to prevent the text from running right
+	up against them.  Matches IE and Mozilla behavior.
+	
+        * khtml/css/html4.css:
+
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
 	Fix <blockquote> tags to have top and bottom margins of 1em.  This matches the <blockquote>
 	behavior in Gecko.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 640f6eb..3d4cbe6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-07-25  David Hyatt  <hyatt at apple.com>
 
+	Floated images using "align" should have margins to prevent the text from running right
+	up against them.  Matches IE and Mozilla behavior.
+	
+        * khtml/css/html4.css:
+
+2002-07-25  David Hyatt  <hyatt at apple.com>
+
 	Fix <blockquote> tags to have top and bottom margins of 1em.  This matches the <blockquote>
 	behavior in Gecko.
 	
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index c86d069..07794bf 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -550,6 +550,15 @@ marquee {
 }
 
 
+/* Give floated images margins of 3px */
+img[align="left"] {
+	margin-right: 3px;
+}
+
+img[align="right"] {
+	margin-left: 3px;
+}
+
 /* noscript is handled internally, as it depends on the html settings */
 
 /* media rules are commented out for the moment. We'll have to add

-- 
WebKit Debian packaging