Merge branch 'master' of github.com:Akylas/nativescript-material-components

# Conflicts:
#	demo-vue/app/app.scss

Author: farfromrefug

demo-ng/package.json

@@ -31,7 +31,7 @@
         "nativescript-material-slider": "file:../packages/nativescript-material-slider",
         "nativescript-material-snackbar": "file:../packages/nativescript-material-snackbar",
         "nativescript-material-textfield": "file:../packages/nativescript-material-textfield",
-        "nativescript-theme-core": "~2.0.24",
+        "@nativescript/theme": "~2.3.2",
         "reflect-metadata": "~0.1.13",
         "rxjs": "~6.5.3",
         "tns-core-modules": "~6.1.2",

demo-ng/src/app.css

@@ -1 +1 @@
-@import '~nativescript-theme-core/css/core.light.css';
+@import '~@nativescript/theme/index';

demo-vue/app/app.scss

@@ -1,4 +1,6 @@
-mdbutton {
+@import '~@nativescript/theme/index';
+
+mdbutton {
     color: black;
     .ns-dark & {
         color: white;

demo-vue/app/views/Home.ts

@@ -8,12 +8,10 @@ export default {
       </ActionBar>
       <ListView ref="listView" rowHeight="50" for="example in examples">
         <v-template>
-        <MDRipple rippleColor="red" @tap="{goToExample(example)}"  @longPress="{goToModalExample(example)}" >
-          <StackLayout class="item" orientation="horizontal" height="40">
+          <MDRipple rippleColor="red" @tap="{goToExample(example)}"  @longPress="{goToModalExample(example)}" >
             <Label paddingLeft="10" :text="example.title" class="title" verticalAlignment="center"/>
-          </StackLayout>
           </MDRipple>
-          </v-template>
+        </v-template>
       </ListView>
     </Page>
     `,

demo-vue/package.json

@@ -32,7 +32,7 @@
         "nativescript-material-snackbar": "file:../packages/nativescript-material-snackbar",
         "nativescript-material-textfield": "file:../packages/nativescript-material-textfield",
         "nativescript-material-textview": "file:../packages/nativescript-material-textview",
-        "nativescript-theme-core": "~2.0.24",
+        "@nativescript/theme": "~2.3.2",
         "tslib": "^1.10.0"
     },
     "devDependencies": {

demo/app/app.scss

@@ -1,4 +1,4 @@
-@import '~nativescript-theme-core/css/core.css';
+@import '~@nativescript/theme/index';
 
 mdbutton {
 }

demo/package.json

@@ -24,7 +24,7 @@
         "nativescript-material-snackbar": "file:../packages/nativescript-material-snackbar",
         "nativescript-material-textfield": "file:../packages/nativescript-material-textfield",
         "nativescript-material-textview": "file:../packages/nativescript-material-textview",
-        "nativescript-theme-core": "^2.0.24",
+        "@nativescript/theme": "~2.3.2",
         "nativescript-ui-listview": "7.1.0",
         "tns-core-modules": "rc"
     },