Skip to content

Commit ca947a2

Browse files
introfogiText-CI
authored andcommitted
Support continuous container for grid
DEVSIX-8331 Autoported commit. Original commit hash: [ae116f477]
1 parent decd255 commit ca947a2

File tree

190 files changed

+543
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+543
-5
lines changed

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridAreaTest.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ public virtual void BorderBoxTest() {
9999
RunTest("borderBoxTest");
100100
}
101101

102+
[NUnit.Framework.Test]
103+
public virtual void BorderBoxTest2() {
104+
RunTest("borderBoxTest2");
105+
}
106+
102107
[NUnit.Framework.Test]
103108
public virtual void DifferentRowSpanOnSplitTest() {
104109
RunTest("differentRowSpanOnSplitTest");

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplateCombinedTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public virtual void TemplateCombinedMixedTest() {
6969

7070
[NUnit.Framework.Test]
7171
public virtual void TemplateCombinedMultiPageTest() {
72-
// TODO DEVSIX-8331
7372
RunTest("template-combined-multipage");
7473
}
7574

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplateRowTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ public virtual void TemplateRowMixedTest() {
109109

110110
[NUnit.Framework.Test]
111111
public virtual void TemplateRowMultiPageTest() {
112-
// TODO DEVSIX-8331
113112
RunTest("template-rows-multipage");
114113
}
115114

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/grid/GridTemplatesTest.cs

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public virtual void BasicColumnFewDivs2Test() {
6464

6565
[NUnit.Framework.Test]
6666
public virtual void BasicColumnMultiPageTest() {
67-
// TODO DEVSIX-8331
6867
RunTest("basicColumnMultiPageTest");
6968
}
7069

@@ -657,6 +656,47 @@ public virtual void InvalidTemplateRows() {
657656
RunTest("invalidTemplateRows");
658657
}
659658

659+
[NUnit.Framework.Test]
660+
public virtual void GridSplitPaddingMarginBorderTest() {
661+
RunTest("gridSplitPaddingMarginBorderTest");
662+
}
663+
664+
[NUnit.Framework.Test]
665+
public virtual void GridSplitPaddingMarginBorderTest2() {
666+
RunTest("gridSplitPaddingMarginBorderTest2");
667+
}
668+
669+
[NUnit.Framework.Test]
670+
public virtual void GridSplitPaddingMarginBorderTest3() {
671+
RunTest("gridSplitPaddingMarginBorderTest3");
672+
}
673+
674+
[NUnit.Framework.Test]
675+
public virtual void GridSplitPaddingMarginBorderTest4() {
676+
RunTest("gridSplitPaddingMarginBorderTest4");
677+
}
678+
679+
[NUnit.Framework.Test]
680+
[LogMessage(LayoutLogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA, LogLevel = LogLevelConstants.WARN)]
681+
public virtual void GridSplitPaddingMarginBorderTest5() {
682+
RunTest("gridSplitPaddingMarginBorderTest5");
683+
}
684+
685+
[NUnit.Framework.Test]
686+
public virtual void GridSplitPaddingMarginBorderTest6() {
687+
RunTest("gridSplitPaddingMarginBorderTest6");
688+
}
689+
690+
[NUnit.Framework.Test]
691+
public virtual void GridSplitPaddingMarginBorderTest7() {
692+
RunTest("gridSplitPaddingMarginBorderTest7");
693+
}
694+
695+
[NUnit.Framework.Test]
696+
public virtual void GridSplitPaddingMarginBorderTest8() {
697+
RunTest("gridSplitPaddingMarginBorderTest8");
698+
}
699+
660700
private void RunTest(String testName) {
661701
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
662702
(SOURCE_FOLDER));

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_multicol/MulticolSpanAll008Test.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You should have received a copy of the GNU Affero General Public License
2525
using iText.Test.Attributes;
2626

2727
namespace iText.Html2pdf.Css.W3c.Css_multicol {
28-
[LogMessage(iText.IO.Logs.IoLogMessageConstant.TYPOGRAPHY_NOT_FOUND, Count = 5)]
28+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.TYPOGRAPHY_NOT_FOUND, Count = 9)]
2929
public class MulticolSpanAll008Test : W3CCssTest {
3030
protected internal override String GetHtmlFileName() {
3131
return "multicol-span-all-008.html";
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<style>
5+
.wrapper {
6+
display: grid;
7+
grid-template-columns: 1fr 2fr 3fr;
8+
grid-template-areas:
9+
"elem1 elem2 elem3"
10+
"elem1 elem4 elem5"
11+
"elem1 elem6 elem7";
12+
}
13+
14+
.wrapper {
15+
border: 2px solid #f76707;
16+
background-color: #fff4e6;
17+
}
18+
19+
.wrapper > div {
20+
border: 10px solid green;
21+
border-top: 20px solid green;
22+
box-sizing: border-box;
23+
background-color: #ffd8a8;
24+
padding: 15px;
25+
padding-top: 30px;
26+
margin: 15px;
27+
margin-top: 30px;
28+
}
29+
</style>
30+
</head>
31+
32+
<body>
33+
<p>Some text</p>
34+
<div class="wrapper">
35+
<div style="grid-area: elem1">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
36+
dolore magna aliquyam erat, sed diam voluptua.</div>
37+
<div style="grid-area: elem2">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
38+
<div style="grid-area: elem3">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
39+
<div style="grid-area: elem4">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
40+
<div style="grid-area: elem5">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
41+
<div style="grid-area: elem6">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
42+
<div style="grid-area: elem7">Lorem ipsum dolor sit amet, consetetur sadipscing elitr.</div>
43+
</div>
44+
<p>Some bottom text</p>
45+
</body>
46+
</html>

0 commit comments

Comments
 (0)