Addressed bug #744: Different behavior of styling on web in development

This commit is contained in:
Eric Traut 2018-08-13 18:05:18 -07:00
Родитель 9e50471729
Коммит 24690ce33d
3 изменённых файлов: 11969 добавлений и 5 удалений

11968
samples/hello-world/package-lock.json сгенерированный Normal file

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -196,7 +196,7 @@ export class Styles extends RX.Styles {
}
if (def.flex !== undefined) {
var flexValue = def.flex;
let flexValue = def.flex;
delete adaptedRuleSet.flex;
if (flexValue > 0) {
// p 1 auto

Просмотреть файл

@ -39,14 +39,12 @@ export class Styles extends RX.Styles {
combinedStyles.marginTop !== undefined || combinedStyles.marginBottom !== undefined) &&
combinedStyles.margin !== undefined) {
console.error('Conflicting rules for margin specified.');
delete combinedStyles.margin;
}
if ((combinedStyles.paddingLeft !== undefined || combinedStyles.paddingRight !== undefined ||
combinedStyles.paddingTop !== undefined || combinedStyles.paddingBottom !== undefined) &&
combinedStyles.padding !== undefined) {
console.error('Conflicting rules for padding specified.');
delete combinedStyles.padding;
}
}
@ -397,7 +395,6 @@ export class Styles extends RX.Styles {
def.marginLeft !== undefined || def.marginRight !== undefined ||
def.marginTop !== undefined || def.marginBottom !== undefined) && def.margin !== undefined) {
console.error('Conflicting rules for margin specified.');
delete def.margin;
}
}
@ -418,7 +415,6 @@ export class Styles extends RX.Styles {
def.paddingLeft !== undefined || def.paddingRight !== undefined ||
def.paddingTop !== undefined || def.paddingBottom !== undefined) && def.padding !== undefined) {
console.error('Conflicting rules for padding specified.');
delete def.padding;
}
}