From dc4a8f745f2e95cd05983a7f0c36834f4b44289f Mon Sep 17 00:00:00 2001 From: vakrilov Date: Thu, 23 Jul 2015 17:02:15 +0300 Subject: [PATCH] FIX: App.css now applied when there is page css --- ui/styling/style-scope.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/styling/style-scope.ts b/ui/styling/style-scope.ts index 2342cbd68..897ac96e2 100644 --- a/ui/styling/style-scope.ts +++ b/ui/styling/style-scope.ts @@ -38,7 +38,13 @@ export class StyleScope { this._reset(); if (!this._cssSelectors) { - this._cssSelectors = new Array(); + // Always add app.css when initializing selectors + if (application.cssSelectorsCache) { + this._cssSelectors = StyleScope._joinCssSelectorsArrays([application.cssSelectorsCache]); + } + else { + this._cssSelectors = new Array(); + } } var selectorsFromFile = StyleScope.createSelectorsFromCss(cssString, cssFileName);