diff options
author | Richard Gibson <richard.gibson@gmail.com> | 2015-05-07 23:16:18 -0400 |
---|---|---|
committer | Richard Gibson <richard.gibson@gmail.com> | 2015-10-18 16:58:38 -0400 |
commit | 487d5ca913c237aafe9efa1179749b46382fddbf (patch) | |
tree | 80ba81e17553a2076ccc3e49999f533a8ad0ea27 /test/data/offset/relative.html | |
parent | c752a5030bc00eb5b45dea9c28963f824a5c4f44 (diff) | |
download | jquery-487d5ca913c237aafe9efa1179749b46382fddbf.tar.gz jquery-487d5ca913c237aafe9efa1179749b46382fddbf.zip |
CSS: Correct misrepresentation of "auto" horizontal margins as 0
Fixes gh-2237
Closes gh-2276
(cherry picked from commit 214e1634ab9b1d13d53647dd5de3bdf7a091d49c)
Conflicts:
src/css.js
src/css/support.js
test/unit/support.js
Diffstat (limited to 'test/data/offset/relative.html')
-rw-r--r-- | test/data/offset/relative.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html index e81186625..f88c82ab9 100644 --- a/test/data/offset/relative.html +++ b/test/data/offset/relative.html @@ -8,6 +8,7 @@ body { margin: 1px; padding: 5px; } div.relative { position: relative; top: 0; left: 0; margin: 1px; border: 2px solid #000; padding: 5px; width: 100px; height: 100px; background: #fff; overflow: hidden; } #relative-2 { top: 20px; left: 20px; } + #relative-2-1 { margin: auto; width: 50px; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } </style> <script src="../../jquery.js"></script> @@ -24,7 +25,7 @@ </head> <body> <div id="relative-1" class="relative"><div id="relative-1-1" class="relative"><div id="relative-1-1-1" class="relative"></div></div></div> - <div id="relative-2" class="relative"></div> + <div id="relative-2" class="relative"><div id="relative-2-1" class="relative"></div></div> <div id="marker"></div> <p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p> </body> |