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

reconstruct scss files structure

Yuki Takei 8 лет назад
Родитель
Сommit
09d9a24f66

+ 3 - 2
config/webpack.common.js

@@ -27,8 +27,9 @@ module.exports = function (options) {
       'legacy-admin':         './resource/js/legacy/crowi-admin',
       'legacy-presentation':  './resource/js/legacy/crowi-presentation',
       'plugin':               './resource/js/plugin',
-      'style':                './resource/styles',
-      'style-presentation':   './resource/styles/presentation',
+      'style':                './resource/styles/scss/style.scss',
+      'style-theme-default':  './resource/styles/scss/theme/default.scss',
+      'style-presentation':   './resource/styles/scss/style-presentation.scss',
     },
     externals: {
       // require("jquery") is external and available

+ 1 - 0
lib/views/layout/layout.html

@@ -75,6 +75,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
   {% endif %}
 
   <script src="{{ webpack_asset('style').js }}"></script>
+  <script src="{{ webpack_asset('style-theme-default').js }}"></script>
   <script src="{{ webpack_asset('commons').js }}" defer></script>
   {% if isEnabledPlugins() %}
     <script src="{{ webpack_asset('plugin').js }}" defer></script>

+ 1 - 0
lib/views/page_presentation.html

@@ -40,6 +40,7 @@ gh/highlightjs/cdn-release@9.12.0/build/languages/yaml.min.js
     {% endif %}
 
     <script src="{{ webpack_asset('style').js }}"></script>
+    <script src="{{ webpack_asset('style-theme-default').js }}"></script>
     <script src="{{ webpack_asset('style-presentation').js }}"></script>
     <script src="{{ webpack_asset('commons').js }}" defer></script>
     <script src="{{ webpack_asset('legacy-presentation').js }}" defer></script>

+ 0 - 2
resource/styles/index.js

@@ -1,2 +0,0 @@
-import './scss/crowi.scss';
-import './scss/theme/default.scss';

+ 0 - 1
resource/styles/presentation.js

@@ -1 +0,0 @@
-import './scss/crowi-reveal.scss';

+ 0 - 0
resource/styles/scss/crowi-reveal.scss → resource/styles/scss/style-presentation.scss


+ 0 - 5
resource/styles/scss/crowi.scss → resource/styles/scss/style.scss

@@ -3,13 +3,8 @@
 @import 'vendor';
 
 // import variables
-// @import '../agile-admin/inverse/colors/default.scss';   // import to read variables
 @import 'variables';
 
-// agile-admin theme
-// @import '../agile-admin/inverse/style';
-// @import '../agile-admin/inverse/colors/default.scss';   // import again to apply styles
-
 // override react-bootstrap-typeahead styles
 @import 'override-rbt';