Styling and rounding fixes for detail boxes

ThaumRystra · May 12, 2015 · 2404845 · 2404845
1 parent bf032bc
commit 2404845
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
@@ -10,7 +10,7 @@
 
 <template name="itemDetails">
 	<div layout horizontal wrap center justified class="headline">
-		{{#if weight}}<div class="sideMargin">{{totalWeight}}lbs</div>{{/if}}
+		{{#if weight}}<div class="sideMargin">{{round totalWeight}}lbs</div>{{/if}}
 		{{#if value}}<div>{{valueString totalValue}}</div>{{/if}}
 	</div>
 	<div layout horizontal wrap class="caption">

diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
@@ -1,7 +1,7 @@
 <template name="experienceDialog">
 	{{#with experience}}
 		{{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
-			<div horizontal layout center-justified>
+			<div horizontal layout center-justified class= "display2">
 				{{value}}
 			</div>
 			{{#if description}}

diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html
@@ -1,5 +1,8 @@
 <template name="raceDialog">
 	{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
+		<div horizontal layout center-justified class= "display2">
+			{{race}}
+		</div>
 		{{> effectsViewList charId=charId parentId=charId parentGroup="racial"}}
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="racial"}}
 	{{else}}

diff --git a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js b/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js
@@ -140,7 +140,12 @@ Template.attributeDialogView.helpers({
 		return char.attributeValue(this.statName);
 	},
 	sourceName: function(){
-		if (this.parent.collection === "Characters") return this.name;
+		if (this.parent.group === "racial"){
+			return this.getParent().race;
+		}
+		if (this.parent.collection === "Characters"){
+			return this.name;
+		}
 		return this.getParent().name;
 	},
 	operationName: function(){

diff --git a/rpg-docs/client/views/feedback/feedback.js b/rpg-docs/client/views/feedback/feedback.js
@@ -9,7 +9,6 @@ Template.feedback.events({
 			url: window.location.href,
 			session: _.pairs(Session.keys),
 		};
-		console.log(report);
 		Meteor.call("insertReport", report);
 	}
 });