Merge branch 'release/3.0.2'

dweber019 · dweber019 · commit f7621372f9f4 · 2017-01-20T13:09:12.000+01:00
diff --git a/package.json b/package.json
@@ -1,10 +1,12 @@
 {
   "name": "aurelia-ts-boilerplate",
   "title": "Aurelia TS Boilerplate",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A starter kit for building a standard navigation-style app with Aurelia, typescript and webpack.",
   "main": "dist/app.js",
   "scripts": {
+    "install:dev": "npm i && npm run install:typings",
+    "install:typings": "./node_modules/.bin/typings i",
     "test": "cross-env NODE_ENV=test TS_NODE_PROJECT=tsconfig.tsnode.json TS_NODE_FAST=true ts-node ./node_modules/karma/bin/karma start test/karma.conf.js",
     "clean": "npm cache clean && rimraf node_modules test/coverage dist",
     "clean:dist": "rimraf dist",
@@ -41,7 +43,10 @@
     "postmobile:setup": "npm run mobile:link",
     "mobile:link": "node ./config/link-mobile.js",
     "mobile:build": "npm run build:dev -- --env.platform mobile",
-    "mobile:release": "npm run build:prod -- --env.platform mobile"
+    "mobile:release": "npm run build:prod -- --env.platform mobile",
+    "ci:build:dev": "npm run mobile:link && npm run mobile:build && npm run cordova:prepare && npm run cordova:build",
+    "cordova:prepare": "cd ./cordova && ./../node_modules/.bin/cordova prepare",
+    "cordova:build": "cd ./cordova && ./../node_modules/.bin/cordova build"
   },
   "repository": {
     "type": "git",
diff --git a/src/index.ejs b/src/index.ejs
@@ -5,26 +5,31 @@
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
+  <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="msapplication-tap-highlight" content="no" />
   <meta name="description" content="<%= htmlWebpackPlugin.options.description %>">
   <meta name="version" content="<%= htmlWebpackPlugin.options.version %>">
   <meta name="author" content="<%= htmlWebpackPlugin.options.author %>">
 
-  <% if (htmlWebpackPlugin.options.platform === 'mobile') { %>
-  <!-- Cordova -->
-  <script src="cordova.js"></script>
-  <% } %>
   <% if (htmlWebpackPlugin.options.platform === 'web') { %>
-  <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
+    <base href="<%= htmlWebpackPlugin.options.baseUrl %>">
   <% } %>
 </head>
 
-<body aurelia-app="main">
-  <div class="splash">
-  	<div class="message"><%- htmlWebpackPlugin.options.title %></div>
-    <i class="fa fa-spinner fa-spin"></i>
+<body>
+  <div aurelia-app="main">
+    <div class="splash">
+      <div class="message"><%- htmlWebpackPlugin.options.title %></div>
+      <i class="fa fa-spinner fa-spin"></i>
+    </div>
   </div>
 
+  <% if (htmlWebpackPlugin.options.platform === 'mobile') { %>
+    <!-- Cordova -->
+    <script src="cordova.js"></script>
+  <% } %>
+
   <% if (htmlWebpackPlugin.options.ENV === 'development') { %>
     <!-- Webpack Dev Server reload -->
     <script src="/webpack-dev-server.js"></script>
diff --git a/src/scss/_aurelia.scss b/src/scss/_aurelia.scss
@@ -59,12 +59,12 @@ section {
 
 /* animate page transitions */
 section.au-enter-active {
-  -webkit-animation: fadeIn 0.5s;
-  animation: fadeIn 0.5s;
+  -webkit-animation: fadeIn 0.3s;
+  animation: fadeIn 0.3s;
 }
 section.au-leave-active {
-  -webkit-animation: fadeOut 0.5s;
-  animation: fadeOut 0.5s;
+  -webkit-animation: fadeOut 0.3s;
+  animation: fadeOut 0.3s;
 }
 
 div.au-stagger {
@@ -78,8 +78,8 @@ div.au-stagger {
 }
 
 .card-container.au-enter-active {
-  -webkit-animation: fadeIn 2s;
-  animation: fadeIn 2s;
+  -webkit-animation: fadeIn 1s;
+  animation: fadeIn 1s;
 }
 
 .card {
diff --git a/src/scss/_base.scss b/src/scss/_base.scss
@@ -1,3 +1,12 @@
+html {
+  overflow: hidden;
+  -ms-content-zooming: none;
+}
+@-ms-viewport {
+  width: device-width;
+  height: device-height;
+}
+
 body {
   margin: 0;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,12 @@ section {`
`59`	`59`
`60`	`60`	`/* animate page transitions */`
`61`	`61`	`section.au-enter-active {`
`62`		`- -webkit-animation: fadeIn 0.5s;`
`63`		`- animation: fadeIn 0.5s;`
	`62`	`+ -webkit-animation: fadeIn 0.3s;`
	`63`	`+ animation: fadeIn 0.3s;`
`64`	`64`	`}`
`65`	`65`	`section.au-leave-active {`
`66`		`- -webkit-animation: fadeOut 0.5s;`
`67`		`- animation: fadeOut 0.5s;`
	`66`	`+ -webkit-animation: fadeOut 0.3s;`
	`67`	`+ animation: fadeOut 0.3s;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`div.au-stagger {`
`@@ -78,8 +78,8 @@ div.au-stagger {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`.card-container.au-enter-active {`
`81`		`- -webkit-animation: fadeIn 2s;`
`82`		`- animation: fadeIn 2s;`
	`81`	`+ -webkit-animation: fadeIn 1s;`
	`82`	`+ animation: fadeIn 1s;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`.card {`