Prepare Scss distribution (#77)

Alexander Vakrilov · NathanWalker · commit 046bcc4d8ad4 · 2016-09-17T14:11:04.000-07:00
diff --git a/app/_bootstrap-map.scss b/app/_bootstrap-map.scss
diff --git a/app/app.ts b/app/app.ts
@@ -9,6 +9,7 @@ TNSFontIcon.paths = {
 };
 TNSFontIcon.loadCss();
 
+application.cssFile = "demo-styles/app.css";
 application.resources['fonticon'] = fonticon;
 application.resources['isActive'] = isActive;
 application.start({ moduleName: 'main-page' });
diff --git a/app/core.dark.android.scss b/app/core.dark.android.scss
@@ -7,6 +7,3 @@
  
 @import 'scss/themes/core/dark';
 @import 'scss/themes/core/platforms/index.android';
-
-// demo app
-@import 'demo';
diff --git a/app/core.dark.ios.scss b/app/core.dark.ios.scss
@@ -7,6 +7,3 @@
  
 @import 'scss/themes/core/dark';
 @import 'scss/themes/core/platforms/index.ios';
-
-// demo app
-@import 'demo';
diff --git a/app/core.light.android.scss b/app/core.light.android.scss
@@ -7,6 +7,3 @@
 
 @import 'scss/themes/core/light';
 @import 'scss/themes/core/platforms/index.android';
-
-// demo app
-@import 'demo';
diff --git a/app/core.light.ios.scss b/app/core.light.ios.scss
@@ -7,6 +7,3 @@
  
 @import 'scss/themes/core/light';
 @import 'scss/themes/core/platforms/index.ios';
-
-// demo app
-@import 'demo';
diff --git a/app/demo-styles/_custom.scss b/app/demo-styles/_custom.scss
diff --git a/app/demo-styles/_demo.scss b/app/demo-styles/_demo.scss
diff --git a/app/demo-styles/app.android.scss b/app/demo-styles/app.android.scss
@@ -13,5 +13,5 @@
 @import 'scss/themes/core/platforms/index.android';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/demo-styles/app.ios.scss b/app/demo-styles/app.ios.scss
@@ -13,5 +13,5 @@
 @import 'scss/themes/core/platforms/index.ios';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/demo-styles/bootstrap-based.android.scss b/app/demo-styles/bootstrap-based.android.scss
@@ -8,15 +8,11 @@
 // Variables form bootstrap v4 dependency
 @import 'bootstrap/scss/variables';
 // Import bootstrap-map patial to apply variable mapping
-@import 'scss/bootstrap-map';
+@import 'bootstrap-map';
 
-/**
- * Base style (un-themed)
- */
-@import 'scss/variables';
-@import 'scss/index';
-@import 'scss/themes/core/platforms/index.android';
+// Import light theme
+@import 'core.light.android.scss';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/demo-styles/bootstrap-based.ios.scss b/app/demo-styles/bootstrap-based.ios.scss
@@ -8,15 +8,11 @@
 // Variables form bootstrap v4 dependency
 @import 'bootstrap/scss/variables';
 // Import bootstrap-map patial to apply variable mapping
-@import 'scss/bootstrap-map';
+@import 'bootstrap-map';
 
-/**
- * Base style (un-themed)
- */
-@import 'scss/variables';
-@import 'scss/index';
-@import 'scss/themes/core/platforms/index.ios';
+// Import light theme
+@import 'core.light.ios.scss';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/demo-styles/core.dark.android.scss b/app/demo-styles/core.dark.android.scss
@@ -0,0 +1,11 @@
+/*!
+ * NativeScript Theme v0.1.0 (https://nativescript.org)
+ * Copyright 2016-2016 The Theme Authors
+ * Copyright 2016-2016 Telerik
+ * Licensed under MIT (https://github.com/NativeScript/theme/blob/master/LICENSE)
+ */
+ 
+@import 'core.dark.android.scss';
+
+// demo app
+@import 'demo-styles/demo';
diff --git a/app/demo-styles/core.dark.ios.scss b/app/demo-styles/core.dark.ios.scss
@@ -0,0 +1,11 @@
+/*!
+ * NativeScript Theme v0.1.0 (https://nativescript.org)
+ * Copyright 2016-2016 The Theme Authors
+ * Copyright 2016-2016 Telerik
+ * Licensed under MIT (https://github.com/NativeScript/theme/blob/master/LICENSE)
+ */
+ 
+@import 'core.dark.ios.scss';
+
+// demo app
+@import 'demo-styles/demo';
diff --git a/app/demo-styles/core.light.android.scss b/app/demo-styles/core.light.android.scss
@@ -0,0 +1,11 @@
+/*!
+ * NativeScript Theme v0.1.0 (https://nativescript.org)
+ * Copyright 2016-2016 The Theme Authors
+ * Copyright 2016-2016 Telerik
+ * Licensed under MIT (https://github.com/NativeScript/theme/blob/master/LICENSE)
+ */
+
+@import 'core.light.android.scss';
+
+// demo app
+@import 'demo-styles/demo';
diff --git a/app/demo-styles/core.light.ios.scss b/app/demo-styles/core.light.ios.scss
@@ -0,0 +1,11 @@
+/*!
+ * NativeScript Theme v0.1.0 (https://nativescript.org)
+ * Copyright 2016-2016 The Theme Authors
+ * Copyright 2016-2016 Telerik
+ * Licensed under MIT (https://github.com/NativeScript/theme/blob/master/LICENSE)
+ */
+ 
+@import 'core.light.ios.scss';
+
+// demo app
+@import 'demo-styles/demo';
diff --git a/app/demo-styles/customized.android.scss b/app/demo-styles/customized.android.scss
@@ -6,15 +6,11 @@
  */
  
 // Theme variables cusomizations
-@import 'custom';
+@import 'demo-styles/custom';
 
-/**
- * Base style (un-themed)
- */
-@import 'scss/variables';
-@import 'scss/index';
-@import 'scss/themes/core/platforms/index.android';
+// Import light theme
+@import 'core.light.android.scss';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/demo-styles/customized.ios.scss b/app/demo-styles/customized.ios.scss
@@ -6,15 +6,11 @@
  */
  
 // Theme variables cusomizations
-@import 'custom';
+@import 'demo-styles/custom';
 
-/**
- * Base style (un-themed)
- */
-@import 'scss/variables';
-@import 'scss/index';
-@import 'scss/themes/core/platforms/index.ios';
+// Import light theme
+@import 'core.light.ios.scss';
 
 // demo app
-@import 'demo';
+@import 'demo-styles/demo';
 
diff --git a/app/pages/themes.ts b/app/pages/themes.ts
@@ -5,6 +5,8 @@ import { knownFolders } from 'file-system';
 import { isIOS, isAndroid } from 'platform';
 var themes = require('nativescript-themes');
 
+const stylesFolder = "demo-styles/";
+
 export class ThemesModel extends BaseModel {
   public labelText: string;
   private _toggled: boolean = false;
@@ -42,7 +44,7 @@ export class ThemesModel extends BaseModel {
   private getPath(name: string) {
     let appPath = knownFolders.currentApp().path + '/';
     let platform = '';
-    return `${appPath}${name}${platform}.css`;
+    return `${appPath}${stylesFolder}${name}${platform}.css`;
   }
 }
 
diff --git a/scripts/builder.js b/scripts/builder.js
@@ -80,10 +80,7 @@ function copyFonts() {
 function copySCSS() {
     var sassFilesPath =  './app/**/*.scss';
     var sassFiles = glob.sync(sassFilesPath).filter(function (filePath) {
-        var path = filePath;
-        var parts = path.split('/');
-        var filename = parts[parts.length - 1];
-        return path.indexOf("App_Resources") === -1 && filename.indexOf('app.') !== 0 && filename.indexOf('_demo') === -1;
+        return filePath.indexOf("App_Resources") === -1 && filePath.indexOf('demo-styles') === -1;
     });
 
     for (var i=0;i<sassFiles.length;i++) {
