[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 4deb4c278c357608b7a7bdaf60e224788f82f28d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 19 21:36:31 2002 +0000

    	Tweak baselines to look a little better for form controls.
    	This will be redone by Darin to really baseline align... this
    	is just temporary.
    
    	Also adding 3px margins to <input> and <textarea> and <select>.
    
            * khtml/css/html4.css:
            * khtml/rendering/render_form.cpp:
            (RenderButton::baselinePosition):
            (RenderSelect::baselinePosition):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1871 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index fb62a4c..99521ed 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-08-19  David Hyatt  <hyatt at apple.com>
+
+	Tweak baselines to look a little better for form controls.
+	This will be redone by Darin to really baseline align... this
+	is just temporary.
+
+	Also adding 3px margins to <input> and <textarea> and <select>.
+	
+        * khtml/css/html4.css:
+        * khtml/rendering/render_form.cpp:
+        (RenderButton::baselinePosition):
+        (RenderSelect::baselinePosition):
+
 2002-08-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index fb62a4c..99521ed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-08-19  David Hyatt  <hyatt at apple.com>
+
+	Tweak baselines to look a little better for form controls.
+	This will be redone by Darin to really baseline align... this
+	is just temporary.
+
+	Also adding 3px margins to <input> and <textarea> and <select>.
+	
+        * khtml/css/html4.css:
+        * khtml/rendering/render_form.cpp:
+        (RenderButton::baselinePosition):
+        (RenderSelect::baselinePosition):
+
 2002-08-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fb62a4c..99521ed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2002-08-19  David Hyatt  <hyatt at apple.com>
+
+	Tweak baselines to look a little better for form controls.
+	This will be redone by Darin to really baseline align... this
+	is just temporary.
+
+	Also adding 3px margins to <input> and <textarea> and <select>.
+	
+        * khtml/css/html4.css:
+        * khtml/rendering/render_form.cpp:
+        (RenderButton::baselinePosition):
+        (RenderSelect::baselinePosition):
+
 2002-08-19  Darin Adler  <darin at apple.com>
 
 	- fixed 3027791 -- Crash when pressing "tab" after going to http://slashdot.org/
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index f444d59..2c973a6 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -388,6 +388,7 @@ BUTTON:active {
    -dwh */
 INPUT, TEXTAREA {
 	font: 11px 'Lucida Grande';
+	margin: 3px;
 }
 
 INPUT[type="hidden"] {
@@ -405,7 +406,7 @@ PARAM  {
 	display: none; 
 }
 
-SELECT { display: block; }
+SELECT { display: block; margin: 3px; }
 
 /*
  * inline elements
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index fb6376b..5dc4347 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -203,7 +203,7 @@ short RenderButton::baselinePosition( bool f ) const
 #if APPLE_CHANGES
     // We put the bottoms of buttons on the baseline,
     // This looks better than trying to line up the button text's baseline.
-    return height() + marginTop();
+    return height() + marginTop() - 2;
 #else
     return RenderWidget::baselinePosition( f ) - 2;
 #endif
@@ -875,7 +875,7 @@ short RenderSelect::baselinePosition( bool f ) const
     if (!m_useListBox) {
         // We put the bottoms of menus on the baseline,
         // This looks better than trying to line up the button text's baseline.
-        return height() + marginTop();
+        return height() + marginTop() - 2;
     } else {
         return RenderWidget::baselinePosition( f ) - 7;
     }

-- 
WebKit Debian packaging