Fixed line break formatting in dialogs

This commit is contained in:
Stefan Zermatten
2015-05-18 13:18:11 +02:00
parent 679292373c
commit a9648c10cc
14 changed files with 39 additions and 22 deletions

View File

@@ -146,3 +146,15 @@ paper-button {
.clickable, core-item, paper-tab {
cursor: pointer;
}
.pre-wrap, .prewrap{
white-space: pre-wrap;
}
.padded {
padding: 8px;
}
.fullwidth {
width: 100%;
}

View File

@@ -32,7 +32,7 @@
{{/if}}
{{#if description}}
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{evaluateString charId description}}</div>
{{/if}}
{{> effectsViewList charId=charId parentId=_id}}

View File

@@ -34,7 +34,7 @@
{{name}}
</div>
<div>
{{damageDice}}&nbsp;{{{evaluateSignedSpaced ../_id damageBonus}}}&nbsp;{{damageType}}
{{evaluateString ../_id damage}}&nbsp;{{damageType}}
</div>
{{#if details}}
<div class="caption">
@@ -102,7 +102,7 @@
</div>
{{#if description}}
<div flex class="bottom text"
>{{description}}</div>
>{{evaluateString charId description}}</div>
{{/if}}
{{#if hasUses}}
<div layout horizontal center end-justified>

View File

@@ -41,6 +41,6 @@
</div>
{{#if description}}
<hr class="vertMargin">
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{evaluateString charId description}}</div>
{{/if}}
</template>

View File

@@ -3,6 +3,9 @@ Template.classDialog.onRendered(function(){
});
Template.classDialog.events({
"color-change": function(event, instance){
Classes.update(instance.data.classId, {$set: {color: event.color}});
},
"tap #deleteButton": function(event, instance){
Classes.softRemoveNode(instance.data.classId);
GlobalUI.deletedToast(instance.data.classId, "Classes", "Class");

View File

@@ -1,12 +1,12 @@
<template name="experienceDialog">
{{#with experience}}
{{#baseDialog title=name class=colorClass hideColor="true" startEditing=../startEditing}}
{{#baseDialog title=name class=color hideColor="true" startEditing=../startEditing}}
<div horizontal layout center-justified class= "display2">
{{value}}
</div>
{{#if description}}
<hr class="vertMargin">
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{description}}</div>
{{/if}}
{{else}}
<div horizontal layout>

View File

@@ -1,6 +1,11 @@
Template.experienceDialog.helpers({
feature: function(){
return Features.findOne(this.featureId);
experience: function(){
Experiences.findOne(this.experienceId);
return Experiences.findOne(this.experienceId);
},
color: function() {
var char = Characters.findOne(this.charId, {fields: {color: 1}});
if (char) return getColorClass(char.color);
},
});
@@ -27,10 +32,3 @@ Template.experienceDialog.events({
Experiences.update(this._id, {$set: {description: value}});
},
});
Template.experienceDialog.helpers({
experience: function(){
Experiences.findOne(this.experienceId);
return Experiences.findOne(this.experienceId);
}
});

View File

@@ -1,7 +1,7 @@
<template name="noteDialog">
{{#with note}}
{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{description}}</div>
{{else}}
{{> noteDialogEdit}}
{{/baseDialog}}

View File

@@ -1,5 +1,5 @@
<template name="raceDialog">
{{#baseDialog title="Race" class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
{{#baseDialog title="Race" class=color hideColor="true" hideDelete="true" startEditing=startEditing}}
<div horizontal layout center-justified class= "display2">
{{race}}
</div>

View File

@@ -13,5 +13,9 @@ Template.raceDialog.helpers({
race: function(){
var char = Characters.findOne(this.charId, {fields: {race: 1}});
return char && char.race;
}
},
color: function() {
var char = Characters.findOne(this.charId, {fields: {color: 1}});
if (char) return getColorClass(char.color);
},
});

View File

@@ -27,7 +27,7 @@
</template>
<template name="containerCard">
{{#containerCardHelper this}}{{body}}{{/containerCardHelper}}
{{#containerCardHelper this}}{{evaluateString _id body}}{{/containerCardHelper}}
</template>
<template name="containerCardHelper">

View File

@@ -1,6 +1,6 @@
<template name="textDialog">
{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
<div class="prewrap">{{value}}</div>
<div class="pre-wrap">{{evaluateString charId value}}</div>
{{else}}
{{> textDialogEdit}}
{{/baseDialog}}

View File

@@ -26,7 +26,7 @@
<span class="body2">Duration: </span><span>{{duration}}</span>
</div>
</div>
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{evaluateString charId description}}</div>
</template>
<template name="spellEdit">

View File

@@ -20,7 +20,7 @@
{{/if}}
</div>
<hr class="vertMargin">
<div class="prewrap">{{description}}</div>
<div class="pre-wrap">{{evaluateString charId description}}</div>
</div>
{{else}}
<!--Name-->