Merge branch 'release-0.6.7a'

rpg-docs/.gitignore

@@ -1,5 +1,6 @@
 .meteor/local
 .meteor/meteorite
+settings.json
 public/components
 nohup.out
 dump

rpg-docs/.meteor/packages

@@ -28,3 +28,4 @@ wolves:bourbon
 meteorhacks:subs-manager
 meteorhacks:kadira
 chuangbo:marked
+reywood:iron-router-ga

rpg-docs/.meteor/versions

@@ -71,6 +71,7 @@ reactive-dict@1.1.0
 reactive-var@1.0.5
 reload@1.1.3
 retry@1.0.3
+reywood:iron-router-ga@0.6.0
 routepolicy@1.0.5
 service-configuration@1.0.4
 session@1.1.0

rpg-docs/Routes/Routes.js

@@ -1,6 +1,7 @@
 Router.configure({
 	loadingTemplate: "loading",
 	layoutTemplate: "layout",
+	trackPageView: true,
 });
 
 Router.plugin("ensureSignedIn", {
@@ -56,6 +57,12 @@ Router.map(function() {
 				document.title = name;
 			}
 		},
+		//analytics
+		trackPageView: false,
+		onRun: function() {
+			window.ga && window.ga("send", "pageview", "/character");
+			this.next();
+		},
 	});
 
 	this.route("loading", {

rpg-docs/client/globalHelpers/GlobalUI.js

@@ -77,10 +77,10 @@ this.GlobalUI = (function() {
 
 	var throttleBack = _.throttle(function() {
 		history.back();
-	}, 800, {trailing: false});
+	}, 100, {trailing: false});
 
 	GlobalUI.closeDetail = function() {
-		if (!!(window.history && window.history.pushState)) {
+		if (window.history && history.pushState && history.state.detail === "opened") {
 			throttleBack();
 		} else {
 			Session.set("global.ui.detailShow", false);

rpg-docs/client/style/tables.scss

@@ -1,8 +1,5 @@
 td {
 	padding: 8px;
-	&:nth-child(1) {
-		min-width: 100px;
-	}
 }
 
 .strengthTable{

rpg-docs/client/views/character/effects/effectEdit/effectEdit.html

@@ -44,7 +44,8 @@
 				 label="Value" 
 				 floatinglabel 
 				 value={{effectValue}} 
-				 flex>
+				 flex
+				 style="flex-basis: 100px;">
 	</paper-input>
 </template>
 

rpg-docs/client/views/home/intro/intro.html

@@ -45,6 +45,15 @@
 						</div>
 						<div class="bottom text">Lawful Good Human</div>
 					</paper-shadow>
+					<paper-shadow class="card characterCard ssWizard clickable"
+								  z="2">
+						<div class="top subhead deep-purple white-text">
+							<div class="subhead" flex>
+								Starter Set Wizard
+							</div>
+						</div>
+						<div class="bottom text">Chaotic Good High Elf</div>
+					</paper-shadow>
 				</div>
 			</div>
 		</div>

rpg-docs/client/views/home/intro/intro.js

@@ -8,6 +8,9 @@ Template.intro.events({
 	"tap .ssArcher": function() {
 		Router.go("/character/yBWwt5XQTTHZiRQxq");
 	},
+	"tap .ssWizard": function() {
+		Router.go("/character/KxHKskm22fS2Xogah");
+	},
 	"tap .guideButton": function() {
 		Router.go("/guide");
 	},

rpg-docs/client/views/loading/loading.html

@@ -4,6 +4,9 @@
 	</core-toolbar>
     <div fit layout vertical center center-justified>
 		<paper-spinner class="bigSpinner" active></paper-spinner>
-		<div class="subhead">{{randomHint}}</div>
+		<div class="subhead" 
+			 style="margin-left: 16px;
+					margin-right: 16px;
+					text-align: center;">{{randomHint}}</div>
 	</div>
 </template>

rpg-docs/client/views/notFound/notFound.html

@@ -1,10 +1,14 @@
 <template name="notFound">
-	<div layout vertical center center-justified fit>
-		<h2>The data for the page you requested could not be found.</h2>
+	<core-toolbar class="app-grey white-text">
+		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+	</core-toolbar>
+	<div layout vertical center center-justified fit 
+		 style="padding: 16px; text-align: center;">
+		<h2 style="margin-bottom: 12px;">The data for the page you requested could not be found.</h2>
 		{{#if currentUser}}
-			<h2>It might not exist, or you might not have permission to view it.</h2>
+			<h3>It might not exist, or you might not have permission to view it.</h3>
 		{{else}}
-			<h2>Perhaps you need to sign in first:</h2>
+			<h3>Perhaps you need to sign in first:</h3>
 			{{atForm}}
 		{{/if}}
 	</div>

rpg-docs/private/changeLogs/changeLogs.js

@@ -235,3 +235,11 @@ ChangeLogs.insert({
 		"Text fields now accept github-flavor markdown formatting",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.6.7",
+	changes: [
+		"Fixed effect values not being visible on small screens",
+		"Added basic analytics",
+	],
+});