mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1306906 - [css-grid] Add/tweak grid container baseline reftests.

This commit is contained in:
Mats Palmgren 2016-10-06 22:43:22 +02:00
Родитель d01e18549b
Коммит 55974a1a48
7 изменённых файлов: 115 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
layout/reftests/css-grid/grid-container-baselines-001-ref.html
Просмотреть файл

@ -15,7 +15,7 @@ html,body {
span {
background: lime;
display: inline-block;
display: inline-grid;
border: 1px solid black;
font-size:12px;
}
@ -39,7 +39,8 @@ span:nth-child(2) {padding-block-end:20px; }
.vrl { writing-mode: vertical-rl; direction:ltr; }
.ib {
display: inline-block;
display: inline-table;
align-items: start;
border: 2px solid;
height: 120px;
margin: 1px;
@ -47,7 +48,8 @@ span:nth-child(2) {padding-block-end:20px; }
position:relative;
}
.ib2 {
display: inline-block;
display: inline-table;
align-items: start;
padding-bottom: 20px;
font-size:1px;
}
@ -58,12 +60,12 @@ span:nth-child(2) {padding-block-end:20px; }
A<div class="ib"><span>B<br>B</span><span style="float:right">C<br>C</span></div>
<div class="ib"><span style="float:left">B<br>B</span><span style="display:inline-flex">C<br>C</span></div>
<div class="ib"><span>B<br>B</span><span style="float:right; visibility:hidden">C<br>C</span><span style="position:absolute; bottom:0; right:0; padding-bottom:20px;">C<br>C</span></div>
<div class="ib"><span>B<br>B</span><span style="float:right; visibility:hidden">C<br>C</span><span style="position:absolute; bottom:2px; right:2px; padding-bottom:20px;">C<br>C</span></div>
<!-- TODO: figure out a reference for the corresponding test -->
<!-- TODO: figure out a reference for the corresponding test -->
<div class="ib"><div style="display:inline-grid; height:120px; align-content:end;"><div><span>B<br>B</span><span>C<br>C</span></div></div></div>
<div class="ib"><div style="display:inline-grid; align-self:baseline; grid: 120px / auto auto"><span class="slb">B<br>B</span><span class="slb">C<br>C</span></div></div>
<div class="ib"><span style="float:right">B<br>B</span><span>C<br>C</span></div>
<div class="ib"><span style="float:right">B<br>B</span><span style="display:inline-flex">C<br>C</span></div>
<!--

14
layout/reftests/css-grid/grid-container-baselines-002-ref.html
Просмотреть файл

@ -15,7 +15,7 @@ html,body {
span {
background: lime;
display: inline-block;
display: inline-grid;
border: 1px solid black;
font-size: 12px;
}
@ -39,15 +39,15 @@ span:nth-child(2) { padding-block-end:20px; }
.vrl { writing-mode: vertical-rl; direction:ltr; }
.ib {
display: inline-block;
display: inline-table;
border: 2px solid;
height: 120px;
padding: 10px 0;
height: 130px;
padding-top: 10px;
margin: 1px;
font-size: 1px;
}
.ib2 { display: inline-block; padding-top:10px; }
.ib3 { display: inline-block; padding-top:20px; }
.ib2 { display: inline-table; padding-top:10px; }
.ib3 { display: inline-table; padding-top:20px; }
</style>
</head>
@ -59,7 +59,7 @@ A<div class="ib"><span>B<br>B</span><span style="float:right">C<br>C</span></div
<!-- TODO: figure out a reference for the corresponding test -->
<!-- TODO: figure out a reference for the corresponding test -->
<div class="ib"><div style="display:inline-grid; height:120px; align-content:end;"><div><span>B<br>B</span><span>C<br>C</span></div></div></div>
<div class="ib"><div style="display:inline-grid; height:120px; align-content:end;"><div style="display:grid; align-self:baseline; grid: 120px / auto auto"><span class="slb">B<br>B</span><span class="slb">C<br>C</span></div></div></div>
<div class="ib"><span style="float:right">B<br>B</span><span>C<br>C</span></div>
<div class="ib"><span style="float:right">B<br>B</span><span style="display:inline-flex">C<br>C</span></div>

15
layout/reftests/css-grid/grid-container-baselines-003-ref.html
Просмотреть файл

@ -5,7 +5,7 @@
-->
<html><head>
<meta charset="utf-8">
<title>Reference: Grid container baselines, nested grids</title>
<title>Reference: Grid container baselines, nested flex/grid/table</title>
<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1151204">
<link rel="stylesheet" type="text/css" href="support/ahem.css">
<style type="text/css">
@ -14,7 +14,7 @@ html,body {
}
.ib {
display: inline-block;
display: inline-table;
height: 163px;
width: 120px;
border: 1px solid;
@ -26,7 +26,7 @@ html,body {
margin: 1px;
}
span { display: inline-block; }
span { display: inline-table; }
.a {
border: 3px solid black;
background:lime;
@ -78,6 +78,7 @@ A<div class="ib">
class="a f" style="width:54px; padding-top:20px">E<br>F</span>
</div>
<div class="ib" style="width:200px;">
<div class="ib" style="height:120px; width:76px; white-space:nowrap"><span
class="a" style="width:32px; margin-top:7px; padding-top:5px; padding-bottom:18px;">A<br>B</span><span
@ -94,11 +95,11 @@ A<div class="ib">
</div>
</div><div class="ib" style="width:200px">
<div class="ib vl" style="height:70px; width:196px;">
<span class="a" style="display:block; padding-block-end:15px; width:calc(100% - 48px); height:-moz-min-content">A<br>B</span>
<span class="a" style="display:block; padding-block-end:15px; width:148px; height:-moz-min-content">A<br>B</span>
</div>
</div><div class="ib" style="width:200px">
<div class="ib vl" style="height:70px; width:196px;">
<span class="a" style="display:block; height:-moz-min-content; padding-block-end:15px; width:calc(100% - 48px); height:-moz-min-content">A<br>B</span>
<span class="a" style="display:block; height:-moz-min-content; padding-block-end:15px; width:148px; height:-moz-min-content">A<br>B</span>
</div>
</div>
@ -108,9 +109,9 @@ A<div class="igrid slb">
<div class="igrid slb" style="grid: 7px 13px 100px / 36px 3px; grid-row: span 4;">
<n></n>
<n style="grid-row:2"></n>
<span class="slb a" style="margin-bottom:7px; padding-bottom:5px; grid-row:3">A<br>B</span>
<span class="slb a" style="margin-bottom:7px; padding-bottom:5px; grid-row:3; display:inline-block">A<br>B</span>
</div>
<span class="slb i a" style="grid-row:4">C<br>D</span>
<span class="slb i a" style="grid-row:4; display:inline-block">C<br>D</span>
<n></n>
</div>

1
layout/reftests/css-grid/grid-container-baselines-003.html
Просмотреть файл

@ -117,7 +117,6 @@ A<div class="igrid sfb">
<span class="sfb a" style="grid-row:1; grid-column:3; padding-top:20px">E<br>F</span>
<n></n>
</div>
<div class="igrid sfb" style="grid-template-columns:60px 60px 60px">
<div class="igrid sfb" style="grid: 100px 7px 13px / 36px; grid-row: span 4;">
<span class="a" style="margin-top:7px; padding-top:5px;">A<br>B</span>

45
layout/reftests/css-grid/grid-container-baselines-004-ref.html Normal file
Просмотреть файл

@ -0,0 +1,45 @@
<!DOCTYPE HTML>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html><head>
<meta charset="utf-8">
<title>CSS Grid Test: Grid container baselines, nested flex/grid/table</title>
<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1306906">
<style type="text/css">
* {
color:black; background-color:white; font-size:16px; font-family:monospace; padding:0; margin:0;
}
grid, flex {
display: inline-flex;
border: 1px solid;
border-width: 10px 0 3px 0;
padding-top: 1px;
}
flex { display:inline-grid; }
table { display:inline-table; }
td { vertical-align: baseline; }
</style>
</head>
<body>
A
<flex>A<br>B</flex>
<flex><span>A<br>B</span></flex>
<grid>A<br>B</grid>
<grid><span>A<br>B</span></grid>
<table cellpadding="0" cellspacing="0"><td><flex>A<br>B</flex></td></table>
<table cellpadding="0" cellspacing="0"><td><grid>A<br>B</grid></td></table>
<!-- <flex><grid>A<br>B</grid></flex> TODO: bug 1306894 -->
<grid><flex>A<br>B</flex></grid>
<flex><flex>A<br>B</flex></flex>
<grid><grid>A<br>B</grid></grid>
</body>
</html>

47
layout/reftests/css-grid/grid-container-baselines-004.html Normal file
Просмотреть файл

@ -0,0 +1,47 @@
<!DOCTYPE HTML>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html><head>
<meta charset="utf-8">
<title>CSS Grid Test: Grid container baselines, nested flex/grid/table</title>
<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1306906">
<link rel="help" href="https://drafts.csswg.org/css-grid/#grid-baselines">
<link rel="match" href="grid-container-baselines-004-ref.html">
<style type="text/css">
* {
color:black; background-color:white; font-size:16px; font-family:monospace; padding:0; margin:0;
}
grid, flex {
display: inline-grid;
border: 1px solid;
border-width: 10px 0 3px 0;
padding-top: 1px;
}
flex { display:inline-flex; }
table { display:inline-table; }
td { vertical-align: baseline; }
</style>
</head>
<body>
A
<flex>A<br>B</flex>
<flex><span>A<br>B</span></flex>
<grid>A<br>B</grid>
<grid><span>A<br>B</span></grid>
<table cellpadding="0" cellspacing="0"><td><flex>A<br>B</flex></td></table>
<table cellpadding="0" cellspacing="0"><td><grid>A<br>B</grid></td></table>
<flex><grid>A<br>B</grid></flex>
<!-- <grid><flex>A<br>B</flex></grid> TODO: bug 1306894 -->
<flex><flex>A<br>B</flex></flex>
<grid><grid>A<br>B</grid></grid>
</body>
</html>

1
layout/reftests/css-grid/reftest.list
Просмотреть файл

@ -92,6 +92,7 @@ skip-if(Android&&isDebugBuild) == grid-justify-content-003.html grid-justify-con
skip-if(!gtkWidget) == grid-container-baselines-001.html grid-container-baselines-001-ref.html
skip-if(!gtkWidget) == grid-container-baselines-002.html grid-container-baselines-002-ref.html
skip-if(!gtkWidget) == grid-container-baselines-003.html grid-container-baselines-003-ref.html
== grid-container-baselines-004.html grid-container-baselines-004-ref.html
skip-if(Android&&isDebugBuild) == grid-column-gap-001.html grid-column-gap-001-ref.html # Bug 1245884 - slow
== grid-column-gap-002.html grid-column-gap-002-ref.html
== grid-column-gap-003.html grid-column-gap-003-ref.html