Просмотр исходного кода

use kibela theme when use kibela layout

yusueketk 7 лет назад
Родитель
Сommit
dca414d251
2 измененных файлов с 30 добавлено и 10 удалено
  1. 15 5
      src/server/views/admin/customize.html
  2. 15 5
      src/server/views/layout/layout.html

+ 15 - 5
src/server/views/admin/customize.html

@@ -3,12 +3,22 @@
 {% block html_title %}{{ customTitle(t('Customize')) }} {% endblock %}
 
 {% block style_css_block %}
-  {% if env === 'development' %}
-    <script src="{{ webpack_asset('styles/style.js') }}"></script>
-    <script src="{{ webpack_asset('styles/theme-' + theme() + '.js') }}"></script>
+  {% if 'kibela' === layoutType() %}
+    {% if env === 'development' %}
+      <script src="{{ webpack_asset('styles/style.js') }}"></script>
+      <script src="{{ webpack_asset('styles/theme-kibela.js') }}"></script>
+    {% else %}
+      <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
+      <link rel="stylesheet" id="jssDefault" {# append id for theme selector #} href="{{ webpack_asset('styles/theme-kibela.css') }}">
+    {% endif %}
   {% else %}
-    <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
-    <link rel="stylesheet" id="jssDefault" {# append id for theme selector #} href="{{ webpack_asset('styles/theme-' + theme() + '.css') }}">
+    {% if env === 'development' %}
+      <script src="{{ webpack_asset('styles/style.js') }}"></script>
+      <script src="{{ webpack_asset('styles/theme-' + theme() + '.js') }}"></script>
+    {% else %}
+      <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
+      <link rel="stylesheet" id="jssDefault" {# append id for theme selector #} href="{{ webpack_asset('styles/theme-' + theme() + '.css') }}">
+    {% endif %}
   {% endif %}
 {% endblock %}
 

+ 15 - 5
src/server/views/layout/layout.html

@@ -84,12 +84,22 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
 
   <!-- styles -->
   {% block style_css_block %}
-    {% if env === 'development' %}
-      <script src="{{ webpack_asset('styles/style.js') }}"></script>
-      <script src="{{ webpack_asset('styles/theme-' + theme() + '.js') }}"></script>
+    {% if 'kibela' === layoutType() %}
+      {% if env === 'development' %}
+        <script src="{{ webpack_asset('styles/style.js') }}"></script>
+        <script src="{{ webpack_asset('styles/theme-kibela.js') }}"></script>
+      {% else %}
+        <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
+        <link rel="stylesheet" href="{{ webpack_asset('styles/theme-kibela.css') }}">
+      {% endif %}
     {% else %}
-      <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
-      <link rel="stylesheet" href="{{ webpack_asset('styles/theme-' + theme() + '.css') }}">
+      {% if env === 'development' %}
+        <script src="{{ webpack_asset('styles/style.js') }}"></script>
+        <script src="{{ webpack_asset('styles/theme-' + theme() + '.js') }}"></script>
+      {% else %}
+        <link rel="stylesheet" href="{{ webpack_asset('styles/style.css') }}">
+        <link rel="stylesheet" href="{{ webpack_asset('styles/theme-' + theme() + '.css') }}">
+      {% endif %}
     {% endif %}
   {% endblock %}