Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html

Issue 26557002: Fix the preferred logical widths code to work with spanning grid items (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html b/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
index fb70e1c52f022895529eedde18de0d5dd793744d..eb7e2ea0aa19deff47d907b78b9d3002899abc4f 100755
--- a/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
+++ b/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
@@ -37,6 +37,11 @@
font: 10px/1 Ahem;
}
+.gridFixedFraction {
+ grid-definition-columns: minmax(10px, 1fr) minmax(2fr, 20px);
+ grid-definition-rows: 10px;
+}
+
.margins {
margin: 10px 20px 30px 40px;
}
@@ -81,6 +86,9 @@
<div class="firstRowSecondColumn">XX XX XX</div>
</div>
+<div class="grid gridFixedFraction min-content" data-expected-height="10" data-expected-width="10"></div>
+<div class="grid gridFixedFraction max-content" data-expected-height="10" data-expected-width="30"></div>
+
<!-- Now with margin on one of the grid items. -->
<div class="grid gridMinContentFixed min-content" data-expected-height="10" data-expected-width="100">
<div class="firstRowFirstColumn">XX XX XX</div>
@@ -107,5 +115,26 @@
<div class="firstRowSecondColumn">XX XX XX</div>
</div>
+<!-- Spanning cells -->
+<div class="grid gridMinContentFixed min-content" data-expected-height="10" data-expected-width="20">
+ <div class="firstRowBothColumn">XX XX XX</div>
+</div>
+<div class="grid gridFixedMinContent max-content" data-expected-height="10" data-expected-width="80">
+ <div class="firstRowBothColumn">XXXXX XXXXX</div>
+ <div class="firstRowSecondColumn">XXXXX XXXXX</div>
+</div>
+<div class="grid gridFixedMaxContent max-content" data-expected-height="10" data-expected-width="80">
+ <div class="firstRowBothColumn">XX XX XX</div>
+ <div class="firstRowBothColumn">XX XX XX</div>
+</div>
+<div class="grid gridAutoContent min-content" data-expected-height="10" data-expected-width="20">
+ <div class="firstRowFirstColumn">XX XX XX</div>
+ <div class="firstRowBothColumn">XX XX XX</div>
+</div>
+<div class="grid gridAutoContent max-content" data-expected-height="10" data-expected-width="120">
+ <div class="firstRowBothColumn">XX XX XX</div>
+ <div class="firstRowSecondColumn">XX XX XX</div>
+</div>
+
</body>
</html>
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698