fixes1,spanning

This commit is contained in:
Riccarr
2020-08-22 19:38:07 -07:00
parent 74b39f5a60
commit 4f3061c790
3 changed files with 124 additions and 206 deletions
+1
View File
@@ -0,0 +1 @@
*.code-workspace
@@ -311,7 +311,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: right;
}
@@ -322,7 +322,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
width: 100%;
}
@@ -340,7 +340,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
}
@@ -379,7 +379,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
}
@@ -393,7 +393,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
width: 100%;
}
@@ -459,7 +459,7 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -487,7 +487,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.9em;
font-size: 1.3em;
align-self: stretch;
justify-self: stretch;
text-align: center;
@@ -500,7 +500,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
align-self: stretch;
justify-self: stretch;
text-align: center;
@@ -523,7 +523,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
margin: 0 auto;
width: 50%;
@@ -537,7 +537,7 @@ body {
/* use dynamic font
font-size: calc(.15vw + .15vh + 1vmin);
*/
font-size: 0.7em;
font-size: 1.1em;
width: 96%;
margin-left: 2px;
margin-top: 5px;
@@ -564,7 +564,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
font-weight: 700;
text-align: center;
/*height: 100%;*/
@@ -578,7 +578,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
font-weight: 700;
text-align: center;
height: 100%;
@@ -609,7 +609,7 @@ body {
.sheet-sh-vigor-label {
color: black;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
font-weight: 700;
text-align: center;
line-height: 25px;
@@ -630,7 +630,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
font-weight: 700;
text-align: center;
line-height: 25px;
@@ -674,7 +674,7 @@ body {
.sheet-sh-resolve-label {
color: black;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
font-weight: 700;
text-align: center;
line-height: 25px;
@@ -707,7 +707,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
font-weight: 700;
text-align: center;
line-height: 25px;
@@ -774,7 +774,7 @@ body {
.sheet-fatigue-despair-label {
color: black;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
font-weight: 700;
height: 100%;
line-height: 25px;
@@ -789,7 +789,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
text-align: center;
width: 15px;
margin: 0px -5px 0px -5px;
@@ -851,7 +851,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
text-align: center;
/*height: 40px;
width: 70%;*/
@@ -862,7 +862,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
text-align: center;
width: 100%;
line-height: 38px;
@@ -874,7 +874,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 1em;
font-size: 1.4em;
text-align: center;
width: 50%;
margin: 10px 5px;
@@ -907,7 +907,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.9em;
font-size: 1.3em;
text-align: center;
align-self: stretch;
justify-self: stretch;
@@ -917,7 +917,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.9em;
font-size: 1.3em;
text-align: center;
align-self: stretch;
justify-self: stretch;
@@ -933,14 +933,14 @@ body {
.sheet-attrib-skills-skills-row-label {
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
padding: 5px 0px 0px 25px;
}
.sheet-attrib-skills-skills-row-label span {
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
}
@@ -951,7 +951,7 @@ body {
.sheet-attrib-skills-skills-row-grid span {
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
padding: 5px 0px 0px 10px;
}
@@ -961,7 +961,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
width: 50%;
margin: 5px 0px 0px 15px;
@@ -1016,7 +1016,7 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -1053,7 +1053,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: .7em;
font-size: 1.1em;
text-align: center;
line-height: 25px;
}
@@ -1064,7 +1064,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
text-align: left;
width: 98%;
margin-left: 1%;
@@ -1094,7 +1094,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: .7em;
font-size: 1.1em;
font-weight: 700;
text-align: center;
height: 40px;
@@ -1110,7 +1110,7 @@ body {
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: .7em;
font-size: 1.1em;
font-weight: 700;
text-align: center;
height: 40px;
@@ -1152,7 +1152,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
text-align: center;
}
@@ -1167,7 +1167,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
height:50px;
line-height: 50px;
@@ -1208,7 +1208,7 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -1233,7 +1233,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
text-align: center;
line-height: 25px;
}
@@ -1244,7 +1244,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
text-align: left;
width: 100%;
height: 100%;
@@ -1275,7 +1275,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.7em;
font-size: 1.1em;
}
.sheet-area-talents fieldset {
@@ -1324,7 +1324,8 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
font-weight: normal;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -1346,7 +1347,7 @@ body {
box-shadow: inset 0 0 30px #000000;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.9em;
font-size: 1.3em;
text-align: center;
line-height: 25px;
/*background-color: olive;*/
@@ -1367,8 +1368,8 @@ body {
height: 30px;
width: 100%;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.9em;
font-weight: bold;
font-size: .8em;
line-height: 30px;
text-align: center;
}
@@ -1379,7 +1380,7 @@ body {
width: 100%;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.8em;
font-size: 1.2em;
line-height: 25px;
text-align: center;
}
@@ -1387,7 +1388,7 @@ body {
.sheet-weapons-separator {
margin: 0px;
background-image: url('ConanSheetHdrlong.png');
background-image: var(--titles_background2);
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
@@ -1415,7 +1416,7 @@ body {
border: 0px;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.8em;
font-size: 1.2em;
line-height: 25px;
text-align: center;
}
@@ -1425,7 +1426,7 @@ body {
grid-template-columns: 50% 50%;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 1em;
font-size: 1.4em;
line-height: 25px;
text-align: center;
}
@@ -1459,7 +1460,7 @@ body {
width: 100%;
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.9em;
font-size: 1.3em;
line-height: 22px;
text-align: center;
grid-column: 1 / 3;
@@ -1468,7 +1469,7 @@ body {
.sheet-weapons-weapon-labels {
font-family: "Macondo Swash Caps";
font-weight: 800;
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
line-height: 25px;
background-color: olive;
@@ -1477,7 +1478,7 @@ body {
.sheet-area-weapons span {
font-weight: 600;
font-family: "Macondo Swash Caps";
font-size: .7em;
font-size: 1.1em;
}
.sheet-area-weapons fieldset {
@@ -1516,7 +1517,7 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -1526,7 +1527,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
line-height: 25px;
}
@@ -1558,7 +1559,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
width: 100%;
height: 100%;
@@ -1596,7 +1597,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
width: 80%;
height: 100%;
@@ -1625,7 +1626,7 @@ body {
padding-bottom: 5px;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
text-align: center;
}
@@ -1655,7 +1656,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
padding: 5px 5px 2px 5px;
}
@@ -1688,7 +1689,7 @@ body {
line-height: 57px;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.8em;
font-size: 2.2em;
text-align: center;
text-shadow: var(--banner_shadow);
}
@@ -1718,7 +1719,7 @@ body {
background-color: olive;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
text-align: center;
}
@@ -1729,7 +1730,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
width: 100%;
height: 100%;
@@ -1742,7 +1743,7 @@ body {
color: black;
font-weight: 700;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: center;
width: 100%;
height: 100%;
@@ -1760,7 +1761,7 @@ body {
padding-bottom: 5px;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: .8em;
font-size: 1.2em;
text-align: center;
}
@@ -1790,7 +1791,7 @@ body {
color: black;
font-weight: 800;
font-family: "Macondo Swash Caps";
font-size: 0.8em;
font-size: 1.2em;
text-align: left;
padding: 5px 5px 2px 5px;
}
@@ -1832,6 +1833,9 @@ body {
.sheet-col-span-1-9 {
grid-column: 1 / span 9;
}
.sheet-col-span-2-1 {
grid-column: 2 / span 1;
}
.sheet-col-span-2-2 {
grid-column: 2 / span 2;
}
@@ -1853,6 +1857,9 @@ body {
.sheet-col-span-2-8 {
grid-column: 2 / span 8;
}
.sheet-col-span-2-9 {
grid-column: 2 / span 9;
}
.sheet-col-span-3-1 {
grid-column: 3 / span 1;
}
@@ -1892,6 +1899,12 @@ body {
.sheet-col-span-9-1 {
grid-column: 9 / span 1;
}
.sheet-row-span-1-1 {
grid-row: 1 / span 1;
}
.sheet-row-span-1-2 {
grid-row: 1 / span 2;
}
.sheet-row-span-1-4 {
grid-row: 1 / span 4;
}
@@ -1959,36 +1972,12 @@ body {
/************ NAME PLATES & SEPARATORS *****************************/
.sheet-separator1 {
margin: 10px;
background-image: url('ConanSheetHdrlong.png');
background-image: var(--titles_background2);
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
height: 30px;
}
.sheet-field-bkgnd1 {
margin: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
background-image: url('field_input_background_parchment1.png');
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
color: black;
font-family: "Macondo Swash Caps";
font-size: 1.0em;
font-weight: 500;
text-align: center;
height: 100%;
line-height: 25px;
}
.sheet-name-plate1 {
margin: 0px 0px 0px 0px;
padding: 0px 0px 0px 0px;
background-image: url('red_name_plate.png');
background-repeat: no-repeat;
background-position: center;
background-size: 100% 100%;
height: 30px;
}
@@ -40,10 +40,10 @@
</div>
-->
<div class="weapons-separator"></div>
<fieldset class="repeating_weapons">
<fieldset class="repeating_weapons">
<div class="weapons-weapon-grid">
<div class="weapons-weapon-name">Weapon Name</div>
<input class="input-field-medium" type="text" name="attr_weapon_Name" style="grid-column: 3 / span 2;"/>
<div class="weapons-weapon-name" >Weapon Name</div>
<input class="input-field-medium sheet-col-span-3-2" type="text" name="attr_weapon_Name"/>
<div class="weapons-weapon-grid-button-group">
Roll:
<button type='roll' name="roll_Combat-Dice"
@@ -312,7 +312,7 @@
<div class="belongings-banner">Belongings</div>
<div class="belongings-outergrid">
<!-- repeating section of belongings rows (grid) -->
<fieldset class="repeating_belongings">
<fieldset class="repeating_belongings col-span-1-1 row-span-1-2">
<div class="belongings-list">
<div class="field-border-narrow belongings-list-hdr">Type</div>
<div class="field-border-narrow belongings-list-hdr">Location</div>
@@ -328,7 +328,7 @@
<input class="input-field-narrow col-span-2-4" type="text" name="attr_belongings-item-desc" />
</div>
</fieldset>
<div class="belongings-cointracker">
<div class="belongings-cointracker col-span-2-1 row-span-1-1">
<div class="belongings-gold">
<div class="belongings-gold-banner">GOLD</div>
<div><input type="text" name="attr_GoldTotal" /></div>
@@ -495,7 +495,7 @@
</button>
</div>
<div class="field-border-narrow talents-grid-label">Effect</div>
<input class="input-field-wide" style="grid-column: 2 / span 9;" name="attr_talent_effect" value="" />
<input class="input-field-wide sheet-col-span-2-9" name="attr_talent_effect" value="" />
</div>
</fieldset>
</div>
@@ -893,123 +893,51 @@
</div>
<!--
<div class="area-stress">
<div class="section-label1">Stress</div>
<table class="attributeTable" border="1" style="width:100%">
<tr>
<td class="attributeTD">Vigor</td>
<td align="center">
<button class="updownbutton" type="action" name="act_addVigor">+</button>
<input style="height: 20px; width: 30px;color: black;" type="text" name="attr_Vigor">
<button class="updownbutton" type="action" name="act_subtractVigor">-</button>
</td>
</tr>
<tr>
<td>Fatigue</td>
<td align="center">
<button class="updownbutton" type="action" name="act_addFatigue">+</button>
<input style="height: 20px; width: 30px;color: black;" type="text" name="attr_Fatigue">
<button class="updownbutton" type="action" name="act_subtractFatigue">-</button>
</td>
</tr>
<tr>
<td>Resolve</td>
<td align="center">
<button class="updownbutton" type="action" name="act_addResolve">+</button>
<input style="height: 20px; width: 30px;color: black;" type="text" name="attr_Resolve">
<button class="updownbutton" type="action" name="act_subtractResolve">-</button>
</td>
</tr>
<tr>
<td>Despair</td>
<td align="center">
<button class="updownbutton" type="action" name="act_addDispair">+</button>
<input style="height: 20px; width: 30px;color: black;" type="text" name="attr_Dispair">
<button class="updownbutton" type="action" name="act_subtractDispair">-</button>
</td>
</tr>
</table>
</div>
<div class="area-momemtum">
<div class="section-label1">Momentum</div>
<table class="attributeTable" border="1" style="width:100%">
<tr>
<td class="attributeTD">Momentum</td>
<td align="center">
<button class="updownbutton" type="action" name="act_addMomentum">+</button>
<input style="height: 20px; width: 30px;color: black;" type="text" name="attr_Momentum">
<button class="updownbutton" type="action" name="act_subtractMomentum">-</button>
</td>
</tr>
</table>
</div>
<script type="text/worker">
<div class="area-bonus-damage">
<div class="section-label1"> Bonus Damage</div>
<table border="1" style="width:100%">
<tr>
<td>
<label>Ranged</label>
<input style=width:130px type="text" name="attr_Ranged" />
</td>
<td>
<label>Melee</label>
<input style=width:130px type="text" name="attr_Melee" />
</td>
<td>
<label>Presence</label>
<input style=width:130px type="text" name="attr_Presance" />
</td>
</tr>
</table>
</div>
function prePopulateSection(sectionName, minRows, fieldName) {
getSectionIDs(sectionName, function(idArray) {
var currentRows = idArray.length;
for(var i = currentRows; i < minRows; i++) {
var newrowid = generateRowID();
var newrowattrs = {};
newrowattrs["repeating_" + sectionName + "_" + newrowid + "_" + fieldName] = " ";
setAttrs(newrowattrs);
}
});
}
handleChangeAttribute = function(eventInfo) {
var attrName = eventInfo.sourceAttribute;
console.log("Attribute changed event for " + attrName);
getAttrs([eventInfo.sourceAttribute], function(values) {
console.log("Attribute value:" + values[attrName]);
});
getSectionRowCount(attrName);
}
//on('change:attribute', handleChangeAttribute);
//on('change:gender', handleChangeAttribute);
//on('change:Gender', handleChangeAttribute);
//on('change:repeating_weapons:weapon_Name', handleChangeAttribute);
on('change:repeating_weapons', handleChangeAttribute); //this fires for any weapon field in row
on('change:repeating_belongings', handleChangeAttribute);
on('change:repeating_talents', handleChangeAttribute);
on('change:repeating_magic', handleChangeAttribute);
on('change:repeating_npc', handleChangeAttribute);
<div class="area-armour">
<div class="section-label1">Armour Value and Type </div>
<table border="1" style="width:100%">
<tr>
<td>
</td>
<td>
<label>Armour Qualities</label>
</td>
</tr>
</table>
<table class="attributeTable" border="1" style="width:100%">
<tr>
<td>1-2&nbsp;</td>
<td>Head&nbsp;</td>
<td>Armour Type&nbsp;</td>
<tr>
<td>3-5&nbsp;</td>
<td>Right Arm&nbsp;</td>
<tr>
<td>6-8&nbsp;</td>
<tr>
<td>9-14&nbsp;</td>
<td>Torso&nbsp;
<tr>
<td>15-17&nbsp;</td>
<tr>
<td>18-20&nbsp;</td>
</tr>
</table>
</div>
-->
<div class="area-footer">
</div>
<script>
on('sheet:opened',function(){
log('Starting Conan sheet...');
//console.log("Rows in weapons:" + getSectionRowCount("weapons"));
//insertRows("weapons", 3, "weapon_Name");
console.log('Starting Conan sheet...');
prePopulateSection("weapons", 2, "weapon_Name");
prePopulateSection("belongings", 3, "weapon_Name");
prePopulateSection("talents", 5, "weapon_Name");
prePopulateSection("magic", 2, "weapon_Name");
prePopulateSection("npc", 1, "weapon_Name");
});
</script>