diff options
| author | Build Agent <build@vaadin.com> | 2014-03-28 12:43:37 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-28 12:43:37 +0200 |
| commit | 9e98c0cb230a26b2f73cb612183c34f2e779645b (patch) | |
| tree | 702dc60064a669a77436c6a67102c658a5c7e6cb /WebContent | |
| parent | 8bf852a4fa84169eae44d96da083224d0d72b6c1 (diff) | |
| parent | 43b8ca588189e3fddf69020e46ada4c3ad170e9f (diff) | |
| download | vaadin-framework-9e98c0cb230a26b2f73cb612183c34f2e779645b.tar.gz vaadin-framework-9e98c0cb230a26b2f73cb612183c34f2e779645b.zip | |
Merge changes from origin/7.1
4f7fc2d Fix invalid copyright header
43b8ca5 Remove unnecessary Webkit scrollbar test
Change-Id: I6153a89f689818fa9f612d4b22303f7d4030fa6d
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html b/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html deleted file mode 100644 index 7547816006..0000000000 --- a/WebContent/statictestfiles/browserfeatures/WebkitPositionAbsoluteScrollbars.html +++ /dev/null @@ -1,69 +0,0 @@ -<!doctype> -<html><head> - <style> - #spacer { - width: 100px; - height: 100px; - background: blue; - } - #scrollable { - background: white; - border: 1px solid black; - overflow: auto; - position: relative; - width: 250px; - } - #container { - position:relative; - display:inline-block; - width:100%; - height:130px; - } - #margin { - position: absolute; - width: 200px; - top: 12px; - margin-right: 12px; - left: 12px; - height: 110px; - } - </style> - </head> - <body> - <div> - Starting point: No horizontal scrollbar<br/> - Expected: Get back to starting point after clicking through steps (do 1, do 2, cancel 1, cancel 2)<br/> - Actual: Scrollbars after doing the steps<br/><br/> - </div> -<button id="step1" onclick="step1();">Step 1 - Enlarge container</button> -<button id="step2" onclick="step2();">Step 2 - Move child</button> -<button id="step3" onclick="step3();">Step 3 - Reduce container</button> -<button id="step4" onclick="step4();">Step 4 - Return child</button> -<div id="scrollable"> -<div id="container"> -<div id="margin" style=""> -<div id="spacer" style="height: 100px; width: 100%;"> -</div> -</div> -</div> -</div> - -<script> -function step1() { - document.getElementById("container").style.width="110%"; -} -function step2() { - document.getElementById("margin").style.left="200px"; -} -function step3() { - document.getElementById("container").style.width="100%"; -} -function step4() { - document.getElementById("margin").style.left="12px"; -} - -</script> - - -</body> -</html> |