Merge pull request #3283 from NativeScript/issue-1639

Added UI test for nested components CSS application
This commit is contained in:
Rossen Hristov
2016-12-12 14:13:18 +02:00
committed by GitHub
7 changed files with 40 additions and 2 deletions

View File

@ -1,3 +1,23 @@
#app { #app {
background-color: lightblue; background-color: lightblue;
}
.ui-tests-app-issue-1639-red {
color: red;
margin-left: 0;
}
.ui-tests-app-issue-1639-green {
color: green;
margin-left: 10;
}
.ui-tests-app-issue-1639-blue {
color: blue;
margin-left: 20;
}
.ui-tests-app-issue-1639-yellow {
color: yellow;
margin-left: 30;
} }

View File

@ -0,0 +1,4 @@
<StackLayout xmlns:cC2="/ui-tests-app/issues/component2">
<Label class="ui-tests-app-issue-1639-green" text="customView green" textWrap="true" />
<cC2:customView2/>
</StackLayout>

View File

@ -0,0 +1,4 @@
<StackLayout xmlns:cC3="/ui-tests-app/issues/component3">
<Label class="ui-tests-app-issue-1639-blue" text="customView2 blue" textWrap="true" />
<cC3:customView3/>
</StackLayout>

View File

@ -0,0 +1,3 @@
<StackLayout>
<Label class="ui-tests-app-issue-1639-yellow" text="customView3 yellow" textWrap="true" />
</StackLayout>

View File

@ -0,0 +1,6 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:cC="ui-tests-app/issues/component">
<StackLayout>
<Label class="ui-tests-app-issue-1639-red" text="main-page red" textWrap="true" />
<cC:customView/>
</StackLayout>
</Page>

View File

@ -20,6 +20,7 @@ export function pageLoaded(args: EventData) {
examples.set("3164", "issues/issue-3164"); examples.set("3164", "issues/issue-3164");
examples.set("3175", "issues/issue-3175"); examples.set("3175", "issues/issue-3175");
examples.set("3211", "issues/issue-3211"); examples.set("3211", "issues/issue-3211");
examples.set("1639", "issues/issue-1639");
let viewModel = new SubMainPageViewModel(wrapLayout, examples); let viewModel = new SubMainPageViewModel(wrapLayout, examples);
page.bindingContext = viewModel; page.bindingContext = viewModel;

View File

@ -9,11 +9,11 @@
"version": "2.4.0" "version": "2.4.0"
}, },
"tns-android": { "tns-android": {
"version": "2.4.0" "version": "2.4.1"
} }
}, },
"dependencies": { "dependencies": {
"tns-core-modules": "2.4.0" "tns-core-modules": "2.4.2"
}, },
"devDependencies": { "devDependencies": {
"tns-platform-declarations": "*", "tns-platform-declarations": "*",