Auto merge of #8538 - notriddle:github_resize, r=mbrubeck

Ignore `<meta name=viewport>` if `@viewport` is ignored

Fixes #8373

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8538)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-17 00:31:49 +05:30
commit c1e6bc0714
6 changed files with 48 additions and 2 deletions

View file

@ -4227,6 +4227,18 @@
"url": "/_mozilla/css/vertical_align_top_span_a.html"
}
],
"css/viewport_ignore_desktop.html": [
{
"path": "css/viewport_ignore_desktop.html",
"references": [
[
"/_mozilla/css/viewport_ignore_desktop_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
@ -9424,6 +9436,18 @@
"url": "/_mozilla/css/vertical_align_top_span_a.html"
}
],
"css/viewport_ignore_desktop.html": [
{
"path": "css/viewport_ignore_desktop.html",
"references": [
[
"/_mozilla/css/viewport_ignore_desktop.html",
"=="
]
],
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
@ -9802,4 +9826,4 @@
"rev": null,
"url_base": "/_mozilla/",
"version": 2
}
}