FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'master' into fix-animation-another-throw · NativeScript/NativeScript@b9f1c0b · GitHub

Commit b9f1c0b

Browse files
Alexander Vakrilov
authored
Merge branch 'master' into fix-animation-another-throw
2 parents 00bc630 + b77675b commit b9f1c0b

5 files changed

Lines changed: 42 additions & 8 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.paddingCssPanel{
2+
vertical-align: center;
3+
font-size: 20;
4+
margin: 15;
5+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Page xmlns="http://schemas.nativescript.org/tns.xsd">
2+
<ActionBar title=" issue-5274 "></ActionBar>
3+
<StackLayout class="paddingCssPanel">
4+
<Label id="label" backgroundColor="green"
5+
text="assrts .paddingCssPanel{
6+
vertical-align: center;
7+
font-size: 20;
8+
margin: 15;
9+
} of StackLayout" textWrap="true" />
10+
<Button id="button" text="change" backgroundColor="yellow" style="padding:50"/>
11+
</StackLayout>
12+
</Page>

‎apps/app/ui-tests-app/issues/main-page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export function loadExamples() {
2626
examples.set("tabview-with-scrollview_4022", "issues/tabview-with-scrollview_4022");
2727
examples.set("3354-ios", "issues/issue-3354");
2828
examples.set("4450", "issues/issue-4450");
29+
examples.set("5274", "issues/issue-5274");
2930

3031
return examples;
3132
}

‎apps/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"repository": "<fill-your-repository-here>",
66
"nativescript": {
77
"id": "org.nativescript.apps",
8-
"tns-ios": {
9-
"version": "3.4.1"
10-
},
118
"tns-android": {
12-
"version": "3.4.1"
9+
"version": "next"
10+
},
11+
"tns-ios": {
12+
"version": "next"
1313
}
1414
},
1515
"dependencies": {
@@ -20,8 +20,8 @@
2020
"babel-types": "6.11.1",
2121
"babylon": "6.8.3",
2222
"lazy": "1.0.11",
23-
"nativescript-dev-typescript": "^0.5.0",
23+
"nativescript-dev-typescript": "^0.7.1",
2424
"tns-platform-declarations": "*",
25-
"typescript": "^2.6.1"
25+
"typescript": "^2.7.2"
2626
}
27-
}
27+
}

‎apps/tsconfig.json‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,21 @@
33
"exclude": [
44
"node_modules",
55
"platforms"
6-
]
6+
],
7+
"compilerOptions": {
8+
"baseUrl": ".",
9+
"paths": {
10+
"*": [
11+
"./node_modules/tns-core-modules/*",
12+
"./node_modules/*"
13+
],
14+
"~/*": [
15+
"app/*"
16+
]
17+
},
18+
"lib": [
19+
"es6",
20+
"dom"
21+
]
22+
}
723
}

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL