v1.202.0

revilowaldow · Mar 24, 2024 · 12f34a3 · 12f34a3
1 parent 84065a0
commit 12f34a3
Show file tree

Hide file tree

Showing 153 changed files with 90,861 additions and 1,943 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ env:
    IMAGE_NAME: 5etools
 
    # Used to force a clean (i.e., non-incremental) Docker build
-   DO_CLEAN_BUILD: 0
+   DO_CLEAN_BUILD: 1
 
 concurrency:
    group: "release"
@@ -52,6 +52,7 @@ jobs:
                echo "IMAGE_VERSION=$IMAGE_VERSION" >> $GITHUB_ENV
 
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
+               echo "IMAGE_ID_IMG=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME-img | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
          -  name: Set Deployed Flag
             run: |
@@ -101,16 +102,21 @@ jobs:
                   # Build an incremental image...
                   echo "Version is ${{ github.ref_name }}, doing an incremental docker build"
 
-                  # Pull the old image
+                  # Pull the old images
                   docker pull $IMAGE_ID:latest
+                  docker pull IMAGE_ID_IMG:latest
 
                   # Save the current CMD from the image
                   SAVE_CMD=$(docker inspect --format='{{json .Config.Cmd}}' $IMAGE_ID:latest)
 
                   # Convert .dockerignore to .rsync-filter
                   bash ./.github/create-rsync-filter.sh
+               
+                  # Copy img files to host
+                  docker run --rm -v "$(pwd)":/tmp/5et-new $IMAGE_ID_IMG:latest rsync -rlcv --filter='dir-merge /tmp/5et-new/.rsync-filter' /var/www/localhost/htdocs/img /tmp/5et-new/
+                  docker rmi $(docker images -q $IMAGE_ID_IMG:*)
 
-                  # Run up the previous container, and rsync the current new of files into it
+                  # Run up the previous containers, and rsync the current new of files into it
                   CONTAINER_ID=$(docker run -d -v "$(pwd)":/tmp/5et-new $IMAGE_ID:latest  rsync -rlcvF --delete-excluded /tmp/5et-new/ /var/www/localhost/htdocs/)
                   docker logs -f $CONTAINER_ID
 

diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -20,6 +20,7 @@
 		"selector-id-pattern": null,
 
 		"color-named": "never",
+		"number-max-precision": 8,
 		"selector-no-qualifying-type": null,
 		"selector-max-compound-selectors": null,
 		"selector-max-id": null,

diff --git a/actions.html b/actions.html
@@ -82,14 +82,14 @@ <h1 class="page__title no-wrap my-0">Actions</h1>
 						<div id="lst__search-glass" class="lst__wrp-search-glass no-events ve-flex-vh-center"><span class="glyphicon glyphicon-search"></span></div>
 						<div class="lst__wrp-search-visible no-events ve-flex-vh-center"></div>
 					</div>
-					<button class="btn btn-default" id="reset">Reset</button>
+					<button type="button" class="btn btn-default" id="reset">Reset</button>
 				</div>
 
 				<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
-					<button class="ve-col-0-3 btn btn-default btn-xs p-0 lst__btn-collapse-all-previews" name="list-toggle-all-previews">[+]</button>
-					<button class="ve-col-5-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
-					<button class="ve-col-4 sort btn btn-default btn-xs" data-sort="time">Time</button>
-					<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
+					<button type="button" class="ve-col-0-3 btn btn-default btn-xs p-0 lst__btn-collapse-all-previews" name="list-toggle-all-previews">[+]</button>
+					<button type="button" class="ve-col-5-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
+					<button type="button" class="ve-col-4 sort btn btn-default btn-xs" data-sort="time">Time</button>
+					<button type="button" class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
 				</div>
 
 				<div id="list" class="list list--stats"></div>
@@ -100,8 +100,8 @@ <h1 class="page__title no-wrap my-0">Actions</h1>
 			<div id="contentwrapper" class="view-col">
 				<div id="sublistcontainer" class="sublist sublist--resizable no-print">
 					<div id="sublistsort" class="btn-group sublist__wrp-cols">
-						<button class="ve-col-8 sort btn btn-default btn-xs" data-sort="name">Name</button>
-						<button class="ve-col-4 sort btn btn-default btn-xs" data-sort="time">Time</button>
+						<button type="button" class="ve-col-8 sort btn btn-default btn-xs" data-sort="name">Name</button>
+						<button type="button" class="ve-col-4 sort btn btn-default btn-xs" data-sort="time">Time</button>
 					</div>
 
 					<div id="sublist" class="list"></div>
@@ -120,7 +120,7 @@ <h1 class="page__title no-wrap my-0">Actions</h1>
 				</div>
 
 				<div class="ve-text-center mt-2 no-print">
-					<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
+					<button type="button" class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 				</div>
 			</div>
 		</div>

diff --git a/backgrounds.html b/backgrounds.html
@@ -82,13 +82,13 @@ <h1 class="page__title no-wrap my-0">Backgrounds</h1>
 						<div id="lst__search-glass" class="lst__wrp-search-glass no-events ve-flex-vh-center"><span class="glyphicon glyphicon-search"></span></div>
 						<div class="lst__wrp-search-visible no-events ve-flex-vh-center"></div>
 					</div>
-					<button class="btn btn-default" id="reset">Reset</button>
+					<button type="button" class="btn btn-default" id="reset">Reset</button>
 				</div>
 
 				<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
-					<button class="ve-col-4 sort btn btn-default btn-xs" data-sort="name">Name</button>
-					<button class="ve-col-6 sort btn btn-default btn-xs" data-sort="skills">Skill Proficiencies</button>
-					<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
+					<button type="button" class="ve-col-4 sort btn btn-default btn-xs" data-sort="name">Name</button>
+					<button type="button" class="ve-col-6 sort btn btn-default btn-xs" data-sort="skills">Skill Proficiencies</button>
+					<button type="button" class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
 				</div>
 
 				<div id="list" class="list list--stats"></div>
@@ -99,8 +99,8 @@ <h1 class="page__title no-wrap my-0">Backgrounds</h1>
 			<div id="contentwrapper" class="view-col">
 				<div id="sublistcontainer" class="sublist sublist--resizable no-print">
 					<div id="sublistsort" class="btn-group sublist__wrp-cols">
-						<button class="ve-col-4 sort btn btn-default btn-xs" data-sort="name">Name</button>
-						<button class="ve-col-8 sort btn btn-default btn-xs" data-sort="skills">Skills</button>
+						<button type="button" class="ve-col-4 sort btn btn-default btn-xs" data-sort="name">Name</button>
+						<button type="button" class="ve-col-8 sort btn btn-default btn-xs" data-sort="skills">Skills</button>
 					</div>
 
 					<div id="sublist" class="list"></div>
@@ -119,8 +119,8 @@ <h1 class="page__title no-wrap my-0">Backgrounds</h1>
 				</div>
 
 				<div class="ve-text-center mt-2 no-print">
-					<button class="btn btn-default btn-xs" id="btn-book">Printer View</button>
-					<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
+					<button type="button" class="btn btn-default btn-xs" id="btn-book">Printer View</button>
+					<button type="button" class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 				</div>
 			</div>
 		</div>

diff --git a/bestiary.html b/bestiary.html
@@ -84,14 +84,14 @@ <h1 class="page__title no-wrap my-0">Bestiary</h1>
 						<div id="lst__search-glass" class="lst__wrp-search-glass no-events ve-flex-vh-center"><span class="glyphicon glyphicon-search"></span></div>
 						<div class="lst__wrp-search-visible no-events ve-flex-vh-center"></div>
 					</div>
-					<button class="btn btn-default" id="reset">Reset</button>
+					<button type="button" class="btn btn-default" id="reset">Reset</button>
 				</div>
 
 				<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
-					<button class="ve-col-4-2 sort btn btn-default btn-xs" data-sort="name">Name</button>
-					<button class="ve-col-4-1 sort btn btn-default btn-xs" data-sort="type">Type</button>
-					<button class="ve-col-1-7 sort btn btn-default btn-xs" data-sort="cr">CR</button>
-					<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
+					<button type="button" class="ve-col-4-2 sort btn btn-default btn-xs" data-sort="name">Name</button>
+					<button type="button" class="ve-col-4-1 sort btn btn-default btn-xs" data-sort="type">Type</button>
+					<button type="button" class="ve-col-1-7 sort btn btn-default btn-xs" data-sort="cr">CR</button>
+					<button type="button" class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
 				</div>
 
 				<div id="list" class="list list--stats"></div>
@@ -106,11 +106,11 @@ <h1 class="page__title no-wrap my-0">Bestiary</h1>
 
 				<div id="sublistcontainer" class="sublist sublist--resizable no-print">
 					<div id="sublistsort" class="btn-group sublist__wrp-cols">
-						<button class="ve-col-5 sort btn btn-default btn-xs" data-sort="name">Name</button>
-						<button class="ve-col-3-8 sort btn btn-default btn-xs best-ecgen__hidden" data-sort="type">Type</button>
-						<button class="ve-col-3-8 sort btn btn-default btn-xs best-ecgen__visible" disabled>&nbsp;</button>
-						<button class="ve-col-1-2 sort btn btn-default btn-xs" data-sort="cr">CR</button>
-						<button class="ve-col-2 sort btn btn-default btn-xs" data-sort="count">Number</button>
+						<button type="button" class="ve-col-5 sort btn btn-default btn-xs" data-sort="name">Name</button>
+						<button type="button" class="ve-col-3-8 sort btn btn-default btn-xs best-ecgen__hidden" data-sort="type">Type</button>
+						<button type="button" class="ve-col-3-8 sort btn btn-default btn-xs best-ecgen__visible" disabled>&nbsp;</button>
+						<button type="button" class="ve-col-1-2 sort btn btn-default btn-xs" data-sort="cr">CR</button>
+						<button type="button" class="ve-col-2 sort btn btn-default btn-xs" data-sort="count">Number</button>
 					</div>
 
 					<div id="sublist" class="list"></div>
@@ -136,15 +136,13 @@ <h1 class="page__title no-wrap my-0">Bestiary</h1>
 				</div>
 
 				<div class="ve-text-center mt-2 no-print best-ecgen__hidden">
-					<button class="btn btn-success btn-xs" id="btn-encounterbuild">Encounter Builder</button>
+					<button type="button" class="btn btn-success btn-xs" id="btn-encounterbuild">Encounter Builder</button>
 					<div id="wrp-profbonusdice" class="ve-inline-block">
-						<button class="btn btn-default btn-xs" id="profbonusdice"
-								title="See the Dungeon Master&apos;s Guide, p263.">Use Proficiency Dice
-						</button>
+						<button type="button" class="btn btn-default btn-xs" id="profbonusdice" title="See the Dungeon Master&apos;s Guide, p263.">Use Proficiency Dice</button>
 					</div>
-					<button class="btn btn-default btn-xs" id="btn-book">Printer View</button>
-					<button class="btn btn-default btn-xs" id="btn-show-table" title="View and Download Creatures in Tabular Format">Table View</button>
-					<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
+					<button type="button" class="btn btn-default btn-xs" id="btn-book">Printer View</button>
+					<button type="button" class="btn btn-default btn-xs" id="btn-show-table" title="View and Download Creatures in Tabular Format">Table View</button>
+					<button type="button" class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 				</div>
 
 				<div class="best-ecgen__visible--flex-col best-ecgen__wrp pb-1 px-2" id="wrp-encounterbuild-group-and-difficulty"></div>

diff --git a/charcreationoptions.html b/charcreationoptions.html
@@ -82,13 +82,13 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
 						<div id="lst__search-glass" class="lst__wrp-search-glass no-events ve-flex-vh-center"><span class="glyphicon glyphicon-search"></span></div>
 						<div class="lst__wrp-search-visible no-events ve-flex-vh-center"></div>
 					</div>
-					<button class="btn btn-default" id="reset">Reset</button>
+					<button type="button" class="btn btn-default" id="reset">Reset</button>
 				</div>
 
 				<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
-					<button class="ve-col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
-					<button class="ve-col-5 sort btn btn-default btn-xs" data-sort="name">Name</button>
-					<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
+					<button type="button" class="ve-col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
+					<button type="button" class="ve-col-5 sort btn btn-default btn-xs" data-sort="name">Name</button>
+					<button type="button" class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
 				</div>
 
 				<div id="list" class="list list--stats"></div>
@@ -99,8 +99,8 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
 			<div id="contentwrapper" class="view-col">
 				<div id="sublistcontainer" class="sublist sublist--resizable no-print">
 					<div id="sublistsort" class="btn-group sublist__wrp-cols">
-						<button class="ve-col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
-						<button class="ve-col-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
+						<button type="button" class="ve-col-5 sort btn btn-default btn-xs" data-sort="type">Type</button>
+						<button type="button" class="ve-col-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
 					</div>
 
 					<div id="sublist" class="list"></div>
@@ -119,7 +119,7 @@ <h1 class="page__title no-wrap my-0">Other Character Creation Options</h1>
 				</div>
 
 				<div class="ve-text-center mt-2 no-print">
-					<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
+					<button type="button" class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 				</div>
 			</div>
 		</div>

diff --git a/classes.html b/classes.html
@@ -75,7 +75,7 @@ <h1 class="page__title no-wrap my-0">Classes</h1>
 <main class="container classes">
 
 	<div class="row">
-		<div class="col-sm-3" id="listcontainer">
+		<div class="col-md-3" id="listcontainer">
 			<div class="night__shadow-big">
 				<div class="lst__form-top" id="filter-search-group">
 					<div class="w-100 relative">
@@ -97,10 +97,10 @@ <h1 class="page__title no-wrap my-0">Classes</h1>
 				<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 			</div>
 		</div>
-		<div class="col-sm-9" id="classtable"></div>
+		<div class="col-md-9" id="classtable"></div>
 	</div>
 	<hr class="mt-0">
-	<div class="row ve-flex mobile__ve-flex-col">
+	<div class="row ve-flex mobile-md__ve-flex-col">
 		<div class="col-md-3">
 			<div class="ve-flex-vh-center ve-text-center wrp-btn-readmode mb-3">
 				<button class="btn btn-default btn-xs no-print mr-1" id="btn-comparemode" title="A pop-up table which can be used to compare subclass features.">Subclass Comparison</button>

diff --git a/conditionsdiseases.html b/conditionsdiseases.html
@@ -82,14 +82,14 @@ <h1 class="page__title no-wrap my-0">Conditions &amp; Diseases</h1>
 						<div id="lst__search-glass" class="lst__wrp-search-glass no-events ve-flex-vh-center"><span class="glyphicon glyphicon-search"></span></div>
 						<div class="lst__wrp-search-visible no-events ve-flex-vh-center"></div>
 					</div>
-					<button class="btn btn-default" id="reset">Reset</button>
+					<button type="button" class="btn btn-default" id="reset">Reset</button>
 				</div>
 
 				<div id="filtertools" class="input-group input-group--bottom ve-flex no-shrink">
-					<button class="ve-col-0-3 btn btn-default btn-xs p-0 lst__btn-collapse-all-previews" name="list-toggle-all-previews">[+]</button>
-					<button class="ve-col-3 sort btn btn-default btn-xs" data-sort="type">Type</button>
-					<button class="ve-col-6-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
-					<button class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
+					<button type="button" class="ve-col-0-3 btn btn-default btn-xs p-0 lst__btn-collapse-all-previews" name="list-toggle-all-previews">[+]</button>
+					<button type="button" class="ve-col-3 sort btn btn-default btn-xs" data-sort="type">Type</button>
+					<button type="button" class="ve-col-6-7 sort btn btn-default btn-xs" data-sort="name">Name</button>
+					<button type="button" class="sort btn btn-default btn-xs ve-grow" data-sort="source">Source</button>
 				</div>
 
 				<div id="list" class="list list--stats"></div>
@@ -100,8 +100,8 @@ <h1 class="page__title no-wrap my-0">Conditions &amp; Diseases</h1>
 			<div id="contentwrapper" class="view-col">
 				<div id="sublistcontainer" class="sublist sublist--resizable no-print">
 					<div id="sublistsort" class="btn-group sublist__wrp-cols">
-						<button class="ve-col-2 sort btn btn-default btn-xs" data-sort="type">Type</button>
-						<button class="ve-col-10 sort btn btn-default btn-xs" data-sort="name">Name</button>
+						<button type="button" class="ve-col-2 sort btn btn-default btn-xs" data-sort="type">Type</button>
+						<button type="button" class="ve-col-10 sort btn btn-default btn-xs" data-sort="name">Name</button>
 					</div>
 
 					<div id="sublist" class="list"></div>
@@ -120,7 +120,7 @@ <h1 class="page__title no-wrap my-0">Conditions &amp; Diseases</h1>
 				</div>
 
 				<div class="ve-text-center mt-2 no-print">
-					<button class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
+					<button type="button" class="btn btn-xs btn-info" id="manage-brew">Manage Homebrew</button>
 				</div>
 			</div>
 		</div>