Merge pull request #3292 from cshtsui/master

[HEX] Eliminate NaN in equipment weight totals / [BRP] Clean up HTML

Basic_Roleplaying/Basic_Roleplaying.css

@@ -152,7 +152,6 @@ div[data-groupname="repeating_Hand-to-Hand"] .sheet-strike-rank
 
 /* Configuration Window*/
 .charsheet .sheet-cdiv {
-    width:810px;
     /*border: 1px dotted;*/
     padding-right: 15px;
     padding-left: 15px;
@@ -317,8 +316,8 @@ button[type="roll"].sheet-plain-major-wound::before
 	
 }
 
-
-button[type="roll"].sheet-plain::before
+/* Increase specificity for now. Should have roll icon affordance instead of suppressing. */
+.ui-dialog .charsheet button[type="roll"].sheet-plain::before
 {
     content: "";
 

HollowEarthExpedition/Hollow-Earth-Expedition.html

@@ -54,7 +54,9 @@
                 });
                 for (var i = 0; i < idarr.length; i++) {
                     getAttrs(["repeating_equipment_" + idarr[i] + "_equipweight"], function (v) {
-                        totalWeight += parseFloat(v[Object.keys(v)[0]]);
+                        var itemWeight = parseFloat(v[Object.keys(v)[0]]);
+                        if (isNaN(itemWeight)) itemWeight=0;
+                        totalWeight += itemWeight;
                         weightTally();
                     });
                 }