Compare commits

...

5 Commits
0.7.0 ... 0.7.1

Author SHA1 Message Date
Stefan Zermatten
425c42d049 Bumped version 2015-09-25 12:52:28 +02:00
Stefan Zermatten
ab6f0c4f5b Merge branch 'fix-columns' 2015-09-25 12:51:04 +02:00
Stefan Zermatten
5d6e57b896 Wrap cards in padded divs to make columns behave 2015-09-25 12:49:48 +02:00
Stefan Zermatten
7c0a8125f2 Merge branch 'fix-carry-capacity-effectView' 2015-09-04 13:56:06 +02:00
Stefan Zermatten
7481ef08a8 Carry capacity effects no longer show up as "no stat" when viewed 2015-09-04 13:55:42 +02:00
11 changed files with 103 additions and 63 deletions

View File

@@ -3,17 +3,24 @@
$thickColumnWidth: 304px; $thickColumnWidth: 304px;
$thinColumnWidth: 240px; $thinColumnWidth: 240px;
//Column layouts of cards //Column layout
.column-container { .column-container {
@include column-fill(balance); @include column-fill(balance);
@include column-gap(8px); @include column-gap(0px);
@include column-width($thickColumnWidth); @include column-width($thickColumnWidth);
padding: 8px; padding: 4px;
&.thin-columns { &.thin-columns {
@include column-count(4); @include column-count(4);
@include column-width($thinColumnWidth); @include column-width($thinColumnWidth);
} }
& > div {
padding: 4px;
//stop divs breaking over multiple columns
-webkit-column-break-inside: avoid;
page-break-inside: avoid;
break-inside: avoid;
}
} }
//Cards //Cards
@@ -21,20 +28,6 @@ $thinColumnWidth: 240px;
background: white; background: white;
border-radius: 2px; border-radius: 2px;
.column-container & {
margin-bottom: 8px;
width: 100%;
//hack to stop flickering
-webkit-backface-visibility: hidden;
-webkit-transform: translateX(0);
//stop breaking over column divide
-webkit-column-break-inside: avoid;
page-break-inside: avoid;
break-inside: avoid;
//Fixes extra margin at top of columns
display: inline-block;
}
.top { .top {
cursor: pointer; cursor: pointer;
padding: 16px; padding: 16px;

View File

@@ -42,6 +42,7 @@ var stats = {
"rageDamage":{"name":"Rage Damage"}, "rageDamage":{"name":"Rage Damage"},
"expertiseDice":{"name":"Expertise Dice"}, "expertiseDice":{"name":"Expertise Dice"},
"superiorityDice":{"name":"Superiority Dice"}, "superiorityDice":{"name":"Superiority Dice"},
"carryMultiplier": {"name": "Carry Capacity Multiplier"},
"level1SpellSlots":{"name":"level 1 Spell Slots"}, "level1SpellSlots":{"name":"level 1 Spell Slots"},
"level2SpellSlots":{"name":"level 2 Spell Slots"}, "level2SpellSlots":{"name":"level 2 Spell Slots"},
"level3SpellSlots":{"name":"level 3 Spell Slots"}, "level3SpellSlots":{"name":"level 3 Spell Slots"},

View File

@@ -14,6 +14,7 @@
{{>resource name="superiorityDice" title="Superiority Dice" color="teal" char=this}} {{>resource name="superiorityDice" title="Superiority Dice" color="teal" char=this}}
<!--Attacks--> <!--Attacks-->
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="top white"> <div class="top white">
Attacks Attacks
@@ -48,8 +49,10 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
<!--Proficiencies--> <!--Proficiencies-->
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="white top"> <div class="white top">
Proficiencies Proficiencies
@@ -75,9 +78,11 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
<!--features--> <!--features-->
{{#each features}} {{#each features}}
<div>
<paper-shadow class="card featureCard" <paper-shadow class="card featureCard"
hero-id="main" {{detailHero}}> hero-id="main" {{detailHero}}>
<div class="top {{colorClass}} subhead" <div class="top {{colorClass}} subhead"
@@ -119,6 +124,7 @@
</div> </div>
{{/if}} {{/if}}
</paper-shadow> </paper-shadow>
</div>
{{/each}} {{/each}}
</div> </div>
<div class="fab-buffer"></div> <div class="fab-buffer"></div>
@@ -138,6 +144,7 @@
<template name="resource"> <template name="resource">
{{#if characterCalculate "attributeBase" char._id name}} {{#if characterCalculate "attributeBase" char._id name}}
<div>
<paper-shadow class="card" <paper-shadow class="card"
hero-id="main" {{detailHero name char._id}} hero-id="main" {{detailHero name char._id}}
layout horizontal> layout horizontal>
@@ -162,5 +169,6 @@
{{title}} {{title}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/if}} {{/if}}
</template> </template>

View File

@@ -3,6 +3,7 @@
<div id="inventory" class="scroll-y" fit> <div id="inventory" class="scroll-y" fit>
<div class="column-container"> <div class="column-container">
<!--Net Worth--> <!--Net Worth-->
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="white top" layout horizontal center> <div class="white top" layout horizontal center>
<div class="subhead" flex> <div class="subhead" flex>
@@ -13,7 +14,9 @@
</div> </div>
</div> </div>
</paper-shadow> </paper-shadow>
</div>
<!--Weight Carried--> <!--Weight Carried-->
<div>
<paper-shadow class="card" <paper-shadow class="card"
hero-id="main" {{detailHero "weightCarried" _id}}> hero-id="main" {{detailHero "weightCarried" _id}}>
<div class="top green white-text weightCarried" <div class="top green white-text weightCarried"
@@ -48,7 +51,9 @@
</div> </div>
{{/if}} {{/if}}
</paper-shadow> </paper-shadow>
</div>
<!--Equipment--> <!--Equipment-->
<div>
<paper-shadow class="card equipmentContainer"> <paper-shadow class="card equipmentContainer">
<div class="white top" layout horizontal center> <div class="white top" layout horizontal center>
<div class="subhead" flex> <div class="subhead" flex>
@@ -76,7 +81,9 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
<!--Carried Items--> <!--Carried Items-->
<div>
<paper-shadow class="card carriedContainer"> <paper-shadow class="card carriedContainer">
<div class="white top" layout horizontal center> <div class="white top" layout horizontal center>
<div class="subhead" flex> <div class="subhead" flex>
@@ -95,7 +102,9 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{#each containers}} {{#each containers}}
<div>
<paper-shadow class="card itemContainer" <paper-shadow class="card itemContainer"
hero-id="main" {{detailHero}}> hero-id="main" {{detailHero}}>
<div class="top {{colorClass}}" <div class="top {{colorClass}}"
@@ -124,6 +133,7 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/each}} {{/each}}
</div> </div>
<div class="fab-buffer"></div> <div class="fab-buffer"></div>

View File

@@ -3,7 +3,7 @@
<div id="journal" class="scroll-y" fit> <div id="journal" class="scroll-y" fit>
<div class="column-container"> <div class="column-container">
<!--Experience Table--> <!--Experience Table-->
<paper-shadow class="card experiencesCard" <div><paper-shadow class="card experiencesCard"
hero-id="main" {{detailHero}}> hero-id="main" {{detailHero}}>
<div class="top white subhead" <div class="top white subhead"
hero-id="toolbar" {{detailHero}} hero-id="toolbar" {{detailHero}}
@@ -37,9 +37,9 @@
</paper-button> </paper-button>
</div> </div>
{{/if}} {{/if}}
</paper-shadow> </paper-shadow></div>
<!--Class Table--> <!--Class Table-->
<paper-shadow class="card" <div><paper-shadow class="card"
hero-id="main" {{detailHero}}> hero-id="main" {{detailHero}}>
<div class="white top" <div class="white top"
hero-id="toolbar" {{detailHero}} hero-id="toolbar" {{detailHero}}
@@ -78,9 +78,10 @@
</div> </div>
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow></div>
<!--Notes--> <!--Notes-->
{{#each notes}} {{#each notes}}
<div>
<paper-shadow class="card" hero-id="main" {{detailHero}}> <paper-shadow class="card" hero-id="main" {{detailHero}}>
<div class="top {{colorClass}} noteTop subhead" <div class="top {{colorClass}} noteTop subhead"
hero-id="toolbar" {{detailHero}} hero-id="toolbar" {{detailHero}}
@@ -89,6 +90,7 @@
</div> </div>
<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div> <div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
</paper-shadow> </paper-shadow>
</div>
{{/each}} {{/each}}
</div> </div>
<div class="fab-buffer"></div> <div class="fab-buffer"></div>

View File

@@ -3,6 +3,7 @@
<div id="persona" class="scroll-y" fit> <div id="persona" class="scroll-y" fit>
<div class="column-container"> <div class="column-container">
{{#with characterDetails}} {{#with characterDetails}}
<div>
<paper-shadow class="card" <paper-shadow class="card"
hero-id="main" {{detailHero "details" _id}}> hero-id="main" {{detailHero "details" _id}}>
{{#unless picture}} {{#unless picture}}
@@ -32,13 +33,15 @@
</div> </div>
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/with}} {{/with}}
{{> containerCard characterField "description" "Description"}} <div>{{> containerCard characterField "description" "Description"}}</div>
{{> containerCard characterField "personality" "Personality Traits"}} <div>{{> containerCard characterField "personality" "Personality Traits"}}</div>
{{> containerCard characterField "ideals" "Ideals"}} <div>{{> containerCard characterField "ideals" "Ideals"}}</div>
{{> containerCard characterField "bonds" "Bonds"}} <div>{{> containerCard characterField "bonds" "Bonds"}}</div>
{{> containerCard characterField "flaws" "Flaws"}} <div>{{> containerCard characterField "flaws" "Flaws"}}</div>
{{> containerCard characterField "backstory" "Background"}} <div>{{> containerCard characterField "backstory" "Background"}}</div>
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="white top subhead"> <div class="white top subhead">
Languages Languages
@@ -49,6 +52,7 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -4,6 +4,7 @@
<div style="padding: 4px;" <div style="padding: 4px;"
layout horizontal start wrap> layout horizontal start wrap>
{{#if hasSlots}} {{#if hasSlots}}
<div>
<paper-shadow class="card" <paper-shadow class="card"
style="margin: 4px;" style="margin: 4px;"
hero-id="main" {{detailHero}}> hero-id="main" {{detailHero}}>
@@ -33,8 +34,10 @@
{{/if}}{{/each}} {{/if}}{{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/if}} {{/if}}
{{#each spellLists}} {{#each spellLists}}
<div>
<paper-shadow class="card spellList" flex <paper-shadow class="card spellList" flex
hero-id="main" {{detailHero}} hero-id="main" {{detailHero}}
style="margin: 4px;"> style="margin: 4px;">
@@ -123,6 +126,7 @@
{{/each}} {{/each}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/each}} {{/each}}
</div> </div>
<div class="fab-buffer"></div> <div class="fab-buffer"></div>

View File

@@ -1,4 +1,5 @@
<template name="abilityMiniCard"> <template name="abilityMiniCard">
<div>
<paper-shadow class="card abilityMiniCard clickable" <paper-shadow class="card abilityMiniCard clickable"
hero-id="main" {{detailHero ability ../_id}} hero-id="main" {{detailHero ability ../_id}}
layout horizontal> layout horizontal>
@@ -11,4 +12,5 @@
{{title}} {{title}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
</template> </template>

View File

@@ -1,5 +1,6 @@
<template name="hitDice"> <template name="hitDice">
{{#if characterCalculate "attributeBase" ../_id name}} {{#if characterCalculate "attributeBase" ../_id name}}
<div>
<paper-shadow class="card hit-dice" hero-id="main" <paper-shadow class="card hit-dice" hero-id="main"
{{detailHero name ../_id}} {{detailHero name ../_id}}
layout horizontal> layout horizontal>
@@ -29,5 +30,6 @@
Hit Dice Hit Dice
</div> </div>
</paper-shadow> </paper-shadow>
</div>
{{/if}} {{/if}}
</template> </template>

View File

@@ -27,6 +27,7 @@
{{>hitDice name="d10HitDice" diceNum="10" char=this}} {{>hitDice name="d10HitDice" diceNum="10" char=this}}
{{>hitDice name="d12HitDice" diceNum="12" char=this}} {{>hitDice name="d12HitDice" diceNum="12" char=this}}
<!--Saving Throws--> <!--Saving Throws-->
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="top white subhead"> <div class="top white subhead">
Saving Throws Saving Throws
@@ -40,7 +41,9 @@
{{> skillRow name="Charisma" skill="charismaSave"}} {{> skillRow name="Charisma" skill="charismaSave"}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
<!--Skills--> <!--Skills-->
<div>
<paper-shadow class="card"> <paper-shadow class="card">
<div class="top white subhead"> <div class="top white subhead">
Skills Skills
@@ -66,11 +69,13 @@
{{> skillRow name="Survival" skill="survival"}} {{> skillRow name="Survival" skill="survival"}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
</div> </div>
</div> </div>
</template> </template>
<template name="statCard"> <template name="statCard">
<div>
<paper-shadow class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal> <paper-shadow class="card statCard clickable" hero-id="main" {{detailHero stat ../_id}} layout horizontal>
<div class="left display1 white-text {{color}}" <div class="left display1 white-text {{color}}"
hero-id="toolbar" {{detailHero stat ../_id}}> hero-id="toolbar" {{detailHero stat ../_id}}>
@@ -84,4 +89,5 @@
{{name}} {{name}}
</div> </div>
</paper-shadow> </paper-shadow>
</div>
</template> </template>

View File

@@ -260,3 +260,11 @@ ChangeLogs.insert({
"Improved loading times by vulcanizing polymer imports", "Improved loading times by vulcanizing polymer imports",
], ],
}); });
ChangeLogs.insert({
version: "0.7.1",
changes: [
"Fixed carry capacity effects not displaying correctly when not editing",
"Changed how columns are presented to fix a display issue introduced in Chrome 44",
],
});