2
0
Yuki Takei 8 жил өмнө
parent
commit
db4b847823

+ 2 - 2
resource/styles/agile-admin/inverse/eliteadmin.scss

@@ -1,4 +1,4 @@
-@import "variables.scss";
+// @import "variables.scss";
 
 // Global Styles
 
@@ -880,7 +880,7 @@ label{
 
 // --Topbar
 .logo b{
-   /*background:$themecolor;*/
+  //  background:$themecolor;
    height: 50px;
    display: inline-block;
    width:60px;

+ 1 - 4
resource/styles/agile-admin/inverse/style.scss

@@ -1,7 +1,4 @@
-// import metismenu styles
-@import '~metismenu/dist/metisMenu';
-
-@import "variables.scss";
+// @import "variables.scss";
 @import "eliteadmin.scss";
 @import "widgets.scss";
 

+ 1 - 0
resource/styles/index.js

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

+ 3 - 0
resource/styles/scss/_vendor.scss

@@ -7,3 +7,6 @@ $bootstrap-sass-asset-helper: true;
 
 // import toastr styles
 @import '~toastr/build/toastr';
+
+// import metismenu styles
+@import '~metismenu/dist/metisMenu';

+ 8 - 8
resource/styles/scss/crowi.scss

@@ -1,16 +1,16 @@
-// import bootstrap variables
-@import "~bootstrap-sass/assets/stylesheets/bootstrap/variables";
-
-// import crowi variables
-@import 'variables';
 
 // vendor
 @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 'override-agileadmin';
+// @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';
 
 // crowi component

+ 0 - 0
resource/styles/scss/_override-agileadmin.scss → resource/styles/scss/theme/_override-agileadmin.scss


+ 11 - 0
resource/styles/scss/theme/default.scss

@@ -0,0 +1,11 @@
+// import to read variables
+@import '../../agile-admin/inverse/colors/default';
+
+// apply agile-admin theme
+@import '../../agile-admin/inverse/style';
+
+// import again to apply colors
+@import '../../agile-admin/inverse/colors/default';
+
+// override
+@import 'override-agileadmin';