Skip to content

Commit e622378

Browse files
committed
Generates -ms-flex-item-align on align-self instead on align-items
1 parent a46c4ae commit e622378

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

lib/hacks/grid-row-align.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class GridRowAlign extends Declaration
1313

1414
# Change IE property back
1515
normalize: (prop) ->
16-
'align-items'
16+
'align-self'
1717

1818
module.exports = GridRowAlign

lib/processor.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ class Processor
7171
# Transition
7272
@prefixes.transition.add(decl, result)
7373

74-
else if decl.prop == 'align-items'
75-
# align-items flexbox or grid
74+
else if decl.prop == 'align-self'
75+
# align-self flexbox or grid
7676
display = @displayType(decl)
7777
if display != 'grid' and @prefixes.options.flexbox != false
78-
prefixer = @prefixes.add['align-items']
78+
prefixer = @prefixes.add['align-self']
7979
if prefixer and prefixer.prefixes
8080
prefixer.process(decl)
8181
if display != 'flex' and @prefixes.options.grid != false
@@ -163,7 +163,7 @@ class Processor
163163
if @prefixes.options.flexbox == false and node.type == 'decl'
164164
if node.prop == 'display' and node.value.indexOf('flex') != -1
165165
return true
166-
other = ['order', 'justify-content', 'align-self', 'align-content']
166+
other = ['order', 'justify-content', 'align-items', 'align-content']
167167
if node.prop.indexOf('flex') != -1 or other.indexOf(node.prop) != -1
168168
return true
169169

test/cases/grid.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
display: grid;
33
grid-template-columns: auto 1fr;
44
justify-items: stretch;
5-
align-items: stretch;
5+
align-self: stretch;
66
grid-column-start: 1;
77
grid-column-end: span 3;
88
}
99

1010
.b {
1111
display: inline-grid;
1212
grid-template-rows: 10px repeat(4, 250px 10px) 20px;
13-
align-items: stretch;
13+
align-self: stretch;
1414
grid-row-start: 1;
1515
grid-row-end: span 3;
1616
}
@@ -27,9 +27,9 @@
2727
}
2828

2929
.unknown {
30-
align-items: start;
30+
align-self: start;
3131
}
3232

3333
.flex {
34-
align-items: flex-end;
34+
align-self: flex-end;
3535
}

test/cases/grid.disabled.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
display: grid;
33
grid-template-columns: auto 1fr;
44
justify-items: stretch;
5-
align-items: stretch;
5+
align-self: stretch;
66
grid-column-start: 1;
77
grid-column-end: span 3;
88
}
99

1010
.b {
1111
display: inline-grid;
1212
grid-template-rows: 10px repeat(4, 250px 10px) 20px;
13-
align-items: stretch;
13+
align-self: stretch;
1414
grid-row-start: 1;
1515
grid-row-end: span 3;
1616
}
@@ -27,11 +27,11 @@
2727
}
2828

2929
.unknown {
30-
-ms-flex-align: start;
31-
align-items: start;
30+
-ms-flex-item-align: start;
31+
align-self: start;
3232
}
3333

3434
.flex {
35-
-ms-flex-align: end;
36-
align-items: flex-end;
35+
-ms-flex-item-align: end;
36+
align-self: flex-end;
3737
}

test/cases/grid.out.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-ms-grid-column-align: stretch;
77
justify-items: stretch;
88
-ms-grid-row-align: stretch;
9-
align-items: stretch;
9+
align-self: stretch;
1010
-ms-grid-column: 1;
1111
grid-column-start: 1;
1212
-ms-grid-column-span: 3;
@@ -19,7 +19,7 @@
1919
-ms-grid-rows: 10px (250px 10px)[4] 20px;
2020
grid-template-rows: 10px repeat(4, 250px 10px) 20px;
2121
-ms-grid-row-align: stretch;
22-
align-items: stretch;
22+
align-self: stretch;
2323
-ms-grid-row: 1;
2424
grid-row-start: 1;
2525
-ms-grid-row-span: 3;
@@ -40,14 +40,14 @@
4040
}
4141

4242
.unknown {
43-
-webkit-align-items: start;
44-
-ms-flex-align: start;
43+
-webkit-align-self: start;
44+
-ms-flex-item-align: start;
4545
-ms-grid-row-align: start;
46-
align-items: start;
46+
align-self: start;
4747
}
4848

4949
.flex {
50-
-webkit-align-items: flex-end;
51-
-ms-flex-align: end;
52-
align-items: flex-end;
50+
-webkit-align-self: flex-end;
51+
-ms-flex-item-align: end;
52+
align-self: flex-end;
5353
}

0 commit comments

Comments
 (0)