diff --git a/VERSION b/VERSION index 8628b91d..6b05f222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop153 +1.18.3-develop154 diff --git a/docs/_static/custom.css b/docs/_static/custom.css index cb8db5a0..f283cbde 100644 --- a/docs/_static/custom.css +++ b/docs/_static/custom.css @@ -391,6 +391,11 @@ table.dualTable td, table.dualTable th { background-color: #181818; border-radius: 10px; margin: 0 5px 5px 0; + text-align: center; + line-height: 20px; +} +.images-inline-link { + font-size: 60%; } .image-accordion { border-radius: 15px; @@ -404,7 +409,7 @@ table.dualTable td, table.dualTable th { outline: none; font-size: 20px; transition: 0.4s; - margin: 15px 0 0 0; + margin: 5px 0 0 0; } .image-active { border-radius: 15px 15px 0 0 !important; @@ -419,6 +424,8 @@ table.dualTable td, table.dualTable th { overflow: auto hidden; border-radius: 0 0 15px 15px; transition: max-height 0.2s ease-out; + padding-left: 10px; + padding-right: 10px; } .image-accordion:after { content: '\25BC'; @@ -439,7 +446,8 @@ table.image-table div { border-radius: 15px; padding: 10px 10px 0 10px; text-align: center; - background-color: #1D1D1D + background-color: #1D1D1D; + line-height: 15px; } table.image-table td:last-child div { margin: 0; diff --git a/docs/home/test.md b/docs/home/test.md index 2207b479..0774ed68 100644 --- a/docs/home/test.md +++ b/docs/home/test.md @@ -11,10 +11,10 @@ $(document).ready(function(){ panel.style.maxHeight = parseInt(panel.scrollHeight) + 10 + "px"; parent.style.maxHeight = parseInt(parent.style.maxHeight) + panel.scrollHeight + "px"; } - if (panel.style.padding) { - panel.style.padding = null; + if (panel.style.paddingBottom) { + panel.style.paddingBottom = null; } else { - panel.style.padding = "0 10px 10px 10px" + panel.style.paddingBottom = "10px"; } }); }); diff --git a/modules/config.py b/modules/config.py index 9ddb7f12..4bb8ca5e 100644 --- a/modules/config.py +++ b/modules/config.py @@ -895,15 +895,15 @@ class ConfigFile: except Failed as e: logger.error(e) - params["images_path"] = [] + params["image_sets"] = [] try: - if lib and "images_path" in lib: - if not lib["images_path"]: - raise Failed("Config Error: images_path attribute is blank") - files = util.load_files(lib["images_path"], "images_path") + if lib and "image_sets" in lib: + if not lib["image_sets"]: + raise Failed("Config Error: image_sets attribute is blank") + files = util.load_files(lib["image_sets"], "image_sets") if not files: - raise Failed("Config Error: No Paths Found for images_path") - params["images_path"] = files + raise Failed("Config Error: No Paths Found for image_sets") + params["image_sets"] = files except Failed as e: logger.error(e) diff --git a/modules/library.py b/modules/library.py index 39669662..788b2e27 100644 --- a/modules/library.py +++ b/modules/library.py @@ -42,7 +42,7 @@ class Library(ABC): self.original_mapping_name = params["mapping_name"] self.metadata_path = params["metadata_path"] self.overlay_path = params["overlay_path"] - self.images_path = params["images_path"] + self.image_sets = params["image_sets"] self.skip_library = params["skip_library"] self.asset_depth = params["asset_depth"] self.asset_directory = params["asset_directory"] if params["asset_directory"] else [] @@ -165,7 +165,7 @@ class Library(ABC): logger.error(e) logger.info("Overlay File Failed To Load") if not operations_only and not overlays_only: - for file_type, images_file, temp_vars, asset_directory in self.images_path: + for file_type, images_file, temp_vars, asset_directory in self.image_sets: try: images_obj = MetadataFile(self.config, self, file_type, images_file, temp_vars, asset_directory, image_set_file=True) self.images_files.append(images_obj)