jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added markdown to text areas

Browse Source
This commit is contained in:
Stefan Zermatten
2015-07-27 10:21:26 +02:00
parent 4b60eac330
commit 0e194a5408
16 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rpg-docs/.meteor/packages
View File

@@ -27,3 +27,4 @@ fourseven:scss@2.1.1
wolves:bourbon
meteorhacks:subs-manager
meteorhacks:kadira
chuangbo:marked

1
rpg-docs/.meteor/versions
View File

@@ -14,6 +14,7 @@ blaze-tools@1.0.3
boilerplate-generator@1.0.3
callback-hook@1.0.3
check@1.0.5
chuangbo:marked@0.3.5
coffeescript@1.0.6
dburles:collection-helpers@1.0.3
dburles:mongo-collection-instances@0.3.3

7
rpg-docs/client/style/main.scss
View File

@@ -29,6 +29,11 @@ core-header-panel[drawer] {
box-shadow: 2px 0px 5px 0px rgba(0,0,0,0.2);
}
//Paragraphs
p {
margin-bottom: 8px;
}
//Horizontal rule
hr {
background-color: #444;
@@ -37,7 +42,7 @@ hr {
color: #444;
height: 1px;
line-height: 0;
margin: 16px -16px;
margin: 16px 0;
text-align: center;
}

2
rpg-docs/client/views/character/features/featureDialog/featureDialog.html
View File

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

5
rpg-docs/client/views/character/features/features.html
View File

@@ -102,8 +102,9 @@
{{/if}}
</div>
{{#if description}}
<div flex class="bottom text"
>{{evaluateString charId shortDescription}}</div>
<div flex class="bottom">
{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
</div>
{{/if}}
{{#if hasUses}}
<div layout horizontal center end-justified>

2
rpg-docs/client/views/character/features/features.js
View File

@@ -5,7 +5,7 @@ Template.features.helpers({
},
shortDescription: function() {
if (_.isString(this.description)){
return this.description.split(/[\n\r]{3,}/)[0];
return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
}
},
hasUses: function(){

2
rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
View File

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

4
rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
View File

@@ -18,8 +18,8 @@
{{#if requiresAttunement}}<div class="vertMargin">Requires Attunement</div>{{/if}}
</div>
{{#if description}}
<hr class="vertMargin">
<div class="pre-wrap">{{evaluateString charId description}}</div>
<hr style="margin: 16px 0 16px 0;">
<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
{{/if}}
{{> effectsViewList charId=charId parentId=_id}}
{{> attacksViewList charId=charId parentId=_id}}

2
rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
View File

@@ -6,7 +6,7 @@
</div>
{{#if description}}
<hr class="vertMargin">
<div class="pre-wrap">{{description}}</div>
<div>{{#markdown}}{{description}}{{/markdown}}</div>
{{/if}}
{{else}}
{{> experienceEdit}}

2
rpg-docs/client/views/character/journal/journal.html
View File

@@ -87,7 +87,7 @@
layout horizontal center>
{{name}}
</div>
<div class="bottom text">{{description}}</div>
<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
</paper-shadow>
{{/each}}
</div>

2
rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
View File

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

2
rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
View File

@@ -1,6 +1,6 @@
<template name="backgroundDialog">
{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
<div class="pre-wrap">{{evaluateString charId value}}</div>
<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
{{else}}
{{> textDialogEdit}}

2
rpg-docs/client/views/character/persona/persona.html
View File

@@ -68,6 +68,6 @@
{{title}}
</div>
</div>
<div class="bottom text">{{> UI.contentBlock}}</div>
<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
</paper-shadow>
</template>

2
rpg-docs/client/views/character/persona/textDialog/textDialog.html
View File

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

2
rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
View File

@@ -34,7 +34,7 @@
</div>
{{/if}}
</div>
<div class="pre-wrap">{{evaluateString charId description}}</div>
<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
{{> attacksViewList charId=charId parentId=_id}}
</template>

2
rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
View File

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