Merge pull request #1005 from eaterofcultists/master

slight modifications
This commit is contained in:
SteveKoontz
2015-08-21 09:36:37 -07:00
2 changed files with 66 additions and 8 deletions
+37 -1
View File
@@ -1,6 +1,6 @@
/* === GENERAL === */
.charsheet {
min-width: 800px;
min-width: 800px;
}
.sheet-row .sheet-col {
@@ -188,3 +188,39 @@ input[type=checkbox].sheet-stress-check:checked ~ label {
margin-left: 2px;
width: calc(100% - 102px);
}
.sheet-rolltemplate-FAE table {
width: 189px;
padding: 2px;
border: 1px solid;
background-color: #ffffff;
}
.sheet-rolltemplate-FAE th {
color: rgb(126, 45, 64);
padding-left: 5px;
line-height: 1.6em;
font-size: 1.2em;
text-align: left;
font-family: "Times New Roman", Times, serif;
font-variant: small-caps;
}
.sheet-rolltemplate-FAE .sheet-arrow-right {
border-top: 3px solid transparent;
border-bottom: 3px solid transparent;
border-left: 180px solid rgb(126, 45, 64);
}
.sheet-rolltemplate-FAE .sheet-tcat {
font-style: italic;
}
.sheet-rolltemplate-FAE td {
padding-left: 5px;
}
.sheet-rolltemplate-FAE-Approaches .inlinerollresult {
background-color: #ffffff;
border: none;
}
+29 -7
View File
@@ -33,35 +33,39 @@
<table class="sheet-approaches">
<tbody>
<tr>
<td><button type='roll' value='/roll 4dF + @{careful}' name='roll_careful' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Careful}} {{roll=[[4DF+@{careful}]]}}' name='roll_careful' /></td>
<td><label>Careful</label></td>
<td><input type="number" name="attr_careful" title="@{careful}"/></td>
</tr>
<tr>
<td><button type='roll' value='/roll 4dF + @{clever}' name='roll_clever' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Clever}} {{roll=[[4DF+@{clever}]]}}' name='roll_clever' /></td>
<td><label>Clever</label></td>
<td><input type="number" name="attr_clever" title="@{clever}"/></td>
</tr>
<tr>
<td><button type='roll' value='/roll 4dF + @{flashy}' name='roll_flashy' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Flashy}} {{roll=[[4DF+@{flashy}]]}}' name='roll_flashy' /></td>
<td><label>Flashy</label></td>
<td><input type="number" name="attr_flashy" title="@{flashy}"/></td>
</tr>
<tr>
<td><button type='roll' value='/roll 4dF + @{forceful}' name='roll_forceful' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Forceful}} {{roll=[[4DF+@{forceful}]]}}' name='roll_forceful' /></td>
<td><label>Forceful</label></td>
<td><input type="number" name="attr_forceful" title="@{forceful}"/></td>
</tr>
<tr>
<td><button type='roll' value='/roll 4dF + @{quick}' name='roll_quick' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Quick}} {{roll=[[4DF+@{quick}]]}}' name='roll_quick' /></td>
<td><label>Quick</label></td>
<td><input type="number" name="attr_quick" title="@{quick}"/></td>
</tr>
<tr>
<td><button type='roll' value='/roll 4dF + @{sneaky}' name='roll_sneaky' /></td>
<td><button type='roll' value='&{template:FAE} {{name=@{name}}} {{approach=Sneaky}} {{roll=[[4DF+@{sneaky}]]}}' name='roll_sneaky' /></td>
<td><label>Sneaky</label></td>
<td><input type="number" name="attr_sneaky" title="@{sneaky}"/></td>
</tr>
<tr>
<td><button type='roll' value='&{template:FAE}{{name=@{name}}}{{effect=?{Approach|Careful, Careful: [[4DF+ @{careful}]]|Clever, Clever: [[4DF+ @{clever}]]|Flashy, Flashy: [[4DF+ @{flashy}]]|Forceful,Forceful: [[4DF+ @{forceful}]]|Quick,Quick: [[4DF+ @{quick}]]|Sneaky,Sneaky: [[4DF+ @{sneaky}]]}}}' name='roll_approachesy' /></td>
<td><label>Approaches</label></td>
</tr>
</tbody>
</table>
</div> <!-- .section-approaches -->
@@ -81,7 +85,7 @@
<div class="sheet-header">Consequences</div>
<fieldset class="repeating_consequences">
<input type="text" name="attr_consequence" />
<select name="attr_consequences_type">
<select name="attr_consequences_type">
<option value="2">Mild(-2)</option>
<option value="4">Moderate(-4)</option>
<option value="6">Severe(-6)</option>
@@ -133,3 +137,21 @@
<textarea name="attr_Extras"></textarea>
</div> <!-- .section-extra -->
</div>
<rolltemplate class="sheet-rolltemplate-FAE">
<table>
<tr><th>{{name}}</th></tr>
{{#approach}}
<tr><th>{{approach}}</th></tr>
{{/approach}}
<tr class="arrow-container"><td><div class="arrow-right"></div></td></tr>
{{#roll}}
<tr><td><span class="tcat">Roll: </span>{{roll}}</td></tr>
{{/roll}}
{{#effect}}
<tr><td><span class="tcat">Effect: </span>{{effect}}</td></tr>
{{/effect}}
</table>
</rolltemplate>