themes.json in j1-template-2020.0.22

- old
+ new

@@ -30,12 +30,12 @@
 {% endcomment %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
-{% assign asset_path          = site.data.template_settings.asset_path %}
-{% assign custom_theme_config = site.data.template_settings.custom_theme %}
+{% assign asset_path          = site.data.j1_config.asset_path %}
+{% assign custom_theme_config = site.data.j1_config.custom_theme %}
 {% assign custom_scss         = custom_theme_config.custom_scss %}
 
 {% capture theme_path %}{{asset_path}}/modules/bs_theme_switcher/themes{% endcapture %}
 
 {% assign production = false %}
@@ -45,21 +45,21 @@
 
 {% if environment == 'development' %}
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.css"}
   ]
 }
 {% else %}
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.min.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.min.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.min.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.min.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.min.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.min.css"}
   ]
 }
 {% endif %}
 
 {% endcapture %}