skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(grid-list): invalid style declaration during server-side rendering (#10131)

Browse Source 
A while ago in #6052, we switched the grid list inline styles to be assigned through the dash-cased properties in order for them to be valid when using the old renderer with parse5. These changes go back to the camel-cased properties, because the dash-cased ones don't work with Domino.

Relates to #6048.
This commit is contained in:
Kristiyan Kostadinov
2018-02-26 15:55:31 +01:00
committed by Jeremy Elbourn
parent 64ef3a8540
commit a27d9dfffc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/grid-list/tile-styler.ts
+6 -6
View File
@@ -210,22 +210,22 @@ export class RatioTileStyler extends TileStyler {
// Use padding-top and margin-top to maintain the given aspect ratio, as
// a percentage-based value for these properties is applied versus the *width* of the
// containing block. See http://www.w3.org/TR/CSS2/box.html#margin-properties
tile._setStyle('margin-top', this.getTilePosition(this.baseTileHeight, rowIndex));
tile._setStyle('padding-top', calc(this.getTileSize(this.baseTileHeight, tile.rowspan)));
tile._setStyle('marginTop', this.getTilePosition(this.baseTileHeight, rowIndex));
tile._setStyle('paddingTop', calc(this.getTileSize(this.baseTileHeight, tile.rowspan)));
}
getComputedHeight(): [string, string] {
return [
'padding-bottom', calc(`${this.getTileSpan(this.baseTileHeight)} + ${this.getGutterSpan()}`)
'paddingBottom', calc(`${this.getTileSpan(this.baseTileHeight)} + ${this.getGutterSpan()}`)
];
}
reset(list: MatGridList) {
list._setListStyle(['padding-bottom', null]);
list._setListStyle(['paddingBottom', null]);
list._tiles.forEach(tile => {
tile._setStyle('margin-top', null);
tile._setStyle('padding-top', null);
tile._setStyle('marginTop', null);
tile._setStyle('paddingTop', null);
});
}