Merge branch 'layout' of git@github.com:sstephenson/prototype into la…

…yout Conflicts: src/dom.js src/dom/dom.js src/dom/layout.js
samleb · Feb 15, 2010 · c32865f · c32865f
2 parents d43c6d4 + 5149c1b
commit c32865f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/dom/layout.js b/src/dom/layout.js
@@ -311,7 +311,7 @@
         // If not, that means the element's width depends upon the width of
         // its parent.
         var parent = element.parentNode, pLayout = $(parent).getLayout();
-        
+
         newWidth = pLayout.get('width') -
          this.get('margin-left') -
          this.get('border-left') -

diff --git a/test/unit/fixtures/dom.css b/test/unit/fixtures/dom.css
@@ -39,6 +39,10 @@ div.style-test { margin-left: 1px }
     width: 20em;
 }
 
+#dimensions-visible {
+  padding-top: 0.1em;
+}
+
 #dimensions-visible-pos-abs,
 #dimensions-display-none-pos-abs {
   position: absolute;