Merge pull request ckan#8470 from aleeexgreeen/incorporate-midnight-b…

…lue-templates [ckan#8420] Incorporate new theme to current development branch
PublicaMundi · Oct 14, 2024 · f405ef3 · f405ef3
2 parents 842050d + 989a145
commit f405ef3
Show file tree

Hide file tree

Showing 553 changed files with 140,874 additions and 2 deletions.
diff --git a/changes/8420.feature b/changes/8420.feature
@@ -0,0 +1,2 @@
+Adds `midnight_blue` templates and public folders for new UI changes and
+allows the folders to be accessed in config
diff --git a/ckan/config/environment.py b/ckan/config/environment.py
@@ -40,7 +40,7 @@ def load_environment(conf: Union[Config, CKANConfig]):
     """
     os.environ['CKAN_CONFIG'] = cast(str, conf['__file__'])
 
-    valid_base_public_folder_names = ['public']
+    valid_base_public_folder_names = ['public', 'public-midnight-blue']
     static_files = conf.get('ckan.base_public_folder', 'public')
     conf['ckan.base_public_folder'] = static_files
 
@@ -188,7 +188,7 @@ def update_config() -> None:
     helpers.load_plugin_helpers()
 
     # Templates and CSS loading from configuration
-    valid_base_templates_folder_names = ['templates']
+    valid_base_templates_folder_names = ['templates', 'templates-midnight-blue']
     templates = config.get('ckan.base_templates_folder')
     config['ckan.base_templates_folder'] = templates
 

diff --git a/ckan/public-midnight-blue/base/.gitignore b/ckan/public-midnight-blue/base/.gitignore
@@ -0,0 +1,2 @@
+**/*.min.js
+**/*.min.css
diff --git a/ckan/public-midnight-blue/base/css/.gitignore b/ckan/public-midnight-blue/base/css/.gitignore
@@ -0,0 +1 @@
+*debug.css
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Adds `midnight_blue` templates and public folders for new UI changes and
		allows the folders to be accessed in config