diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-12 02:12:51 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-12 02:12:51 -0700 |
| commit | f451005f4fe075c849de2f3766f5bf84510b8465 (patch) | |
| tree | e6331578b227c2359f5d7c1a5d06276477e74c87 /tests | |
| parent | 9f8dda7abc5f2dc97f5d90aa24fcc5b596ab6918 (diff) | |
| parent | c254d195ad07d4f815005e405e5e45b7303b07a3 (diff) | |
| download | servo-f451005f4fe075c849de2f3766f5bf84510b8465.tar.gz servo-f451005f4fe075c849de2f3766f5bf84510b8465.zip | |
auto merge of #4171 : jbcrail/servo/fix-spelling, r=jdm
I only updated comments, not strings.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/html/acid2.html | 2 | ||||
| -rwxr-xr-x | tests/ref/acid2_noscroll.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/html/acid2.html b/tests/html/acid2.html index b6432099e4d..9c7712a22f7 100755 --- a/tests/html/acid2.html +++ b/tests/html/acid2.html @@ -19,7 +19,7 @@ /* picture setup */ #top { margin: 100em 3em 0; padding: 2em 0 0 .5em; text-align: left; font: 2em/24px sans-serif; color: navy; white-space: pre; } /* "Hello World!" text */ .picture { position: relative; border: 1em solid transparent; margin: 0 0 100em 3em; } /* containing block for face */ - .picture { background: red; } /* overriden by preferred stylesheet below */ + .picture { background: red; } /* overridden by preferred stylesheet below */ /* top line of face (scalp): fixed positioning and min/max height/width */ .picture p { position: fixed; margin: 0; padding: 0; border: 0; top: 9em; left: 11em; width: 140%; max-width: 4em; height: 8px; min-height: 1em; max-height: 2mm; /* min-height overrides max-height, see 10.7 */ background: black; border-bottom: 0.5em yellow solid; } diff --git a/tests/ref/acid2_noscroll.html b/tests/ref/acid2_noscroll.html index 5c6e6ff1112..9dc184e9ee5 100755 --- a/tests/ref/acid2_noscroll.html +++ b/tests/ref/acid2_noscroll.html @@ -26,7 +26,7 @@ /* picture setup */ #top { margin: 100em 3em 0; padding: 2em 0 0 .5em; text-align: left; font: 2em/24px sans-serif; color: navy; white-space: pre; } /* "Hello World!" text */ .picture { position: relative; border: 1em solid transparent; margin: 0 0 100em 3em; } /* containing block for face */ - .picture { background: red; } /* overriden by preferred stylesheet below */ + .picture { background: red; } /* overridden by preferred stylesheet below */ /* top line of face (scalp): fixed positioning and min/max height/width */ .picture p { position: fixed; margin: 0; padding: 0; border: 0; top: 9em; left: 11em; width: 140%; max-width: 4em; height: 8px; min-height: 1em; max-height: 2mm; /* min-height overrides max-height, see 10.7 */ background: black; border-bottom: 0.5em yellow solid; } |