Parcourir la source

128303 build fire future and halloween

soumaeda il y a 2 ans
Parent
commit
af495f9349

+ 0 - 2
packages/core/scss/bootstrap/_init.scss

@@ -2,9 +2,7 @@
 
 @import './variables';
 @import 'bootstrap/scss/variables';
-@import 'bootstrap/scss/variables-dark';
 
-@import 'bootstrap/scss/maps';
 // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // merge $colors to $theme-colors
 // $theme-colors: map-merge($theme-colors, $colors);

+ 8 - 7
packages/preset-themes/src/styles/fire-red.scss

@@ -1,5 +1,6 @@
-@use './variables' as *;
-@use './bootstrap/variables' as *;
+@use '@growi/core/scss/bootstrap/init' as bs;
+
+@use './variables' as var;
 @use './theme/mixins/page-editor-mode-manager';
 @use './theme/hsl-functions' as hsl;
 
@@ -19,7 +20,7 @@
   --bgcolor-global: hsl(var(--bgcolor-global-hs),var(--bgcolor-global-l));
   --bgcolor-global-hs: 0,0%;
   --bgcolor-global-l: 100%;
-  --bgcolor-inline-code: #{$gray-100}; //optional
+  --bgcolor-inline-code: #{bs.$gray-100}; //optional
   --bgcolor-card: var(--accentcolor);
   --bgcolor-blinked-section: #{hsl.alpha(var(--primary),10%)};
   //--bgcolor-keyword-highlighted: #{$grw-marker-yellow};
@@ -28,7 +29,7 @@
   --color-global: hsl(var(--color-global-hs),var(--color-global-l));
   --color-global-hs: 0,0%;
   --color-global-l: 17%;
-  --color-reversal: #{$gray-100};
+  --color-reversal: #{bs.$gray-100};
   --color-link: var(--primary);
   --color-link-hs: var(--primary-hs);
   --color-link-l: var(--primary-l);
@@ -149,16 +150,16 @@
   --bgcolor-global: hsl(var(--bgcolor-global-hs),var(--bgcolor-global-l));
   --bgcolor-global-hs: 0,0%;
   --bgcolor-global-l: 20%;
-  --bgcolor-inline-code: #{$gray-100}; //optional
+  --bgcolor-inline-code: #{bs.$gray-100}; //optional
   --bgcolor-card: #{hsl.darken(var(--bgcolor-global), 5%)};
   --bgcolor-blinked-section: #{hsl.alpha(var(--primary),50%)};
-  --bgcolor-keyword-highlighted: #{darken($grw-marker-red, 30%)};
+  --bgcolor-keyword-highlighted: #{darken(var.$grw-marker-red, 30%)};
 
   // Font colors
   --color-global: hsl(var(--color-global-hs),var(--color-global-l));
   --color-global-hs: 0,0%;
   --color-global-l: 100%;
-  --color-reversal: #{$gray-100};
+  --color-reversal: #{bs.$gray-100};
   --color-link: var(--primary);
   --color-link-hs: var(--primary-hs);
   --color-link-l: var(--primary-l);

+ 6 - 5
packages/preset-themes/src/styles/future.scss

@@ -1,5 +1,6 @@
-@use './variables' as *;
-@use './bootstrap/variables' as *;
+@use '@growi/core/scss/bootstrap/init' as bs;
+
+@use './variables' as var;
 @use './theme/mixins/page-editor-mode-manager';
 @use './theme/hsl-functions' as hsl;
 
@@ -24,13 +25,13 @@
   --bgcolor-inline-code: #1f1f22; //optional
   --bgcolor-card: #{hsl.darken(var(--themecolor), 5%)};
   --bgcolor-blinked-section: #{hsl.alpha(var(--primary), 40%)};
-  --bgcolor-keyword-highlighted: #{darken($grw-marker-red, 30%)};
+  --bgcolor-keyword-highlighted: #{darken(var.$grw-marker-red, 30%)};
 
   // Font colors
   --color-global: #{hsl(var(--color-global-hs),var(--color-global-l))};
   --color-global-hs: 204,21%;
   --color-global-l: 66%;
-  --color-reversal: #{$gray-900};
+  --color-reversal: #{bs.$gray-900};
   --color-header: var(--color-global);
   --color-link: var(--accentcolor);
   --color-link-hover: #{hsl.lighten(var(--accentcolor), 20%)};
@@ -117,7 +118,7 @@
   --bordercolor-inline-code: #4d4d4d; // optional
 
   // Dropdown colors
-  --bgcolor-dropdown-link-active: #{$growi-blue};
+  --bgcolor-dropdown-link-active: #{var.$growi-blue};
 
   // admin theme box
   --color-theme-color-box: #{hsl.lighten(var(--primary), 20%)};

+ 4 - 3
packages/preset-themes/src/styles/halloween.scss

@@ -1,5 +1,6 @@
-@use './variables' as *;
-@use './bootstrap/variables' as *;
+@use '@growi/core/scss/bootstrap/init' as bs;
+
+@use './variables' as var;
 @use './theme/mixins/page-editor-mode-manager';
 @use './theme/hsl-functions' as hsl;
 
@@ -109,7 +110,7 @@ $bordercolor: #7e0d7e;
   --color-editor-icons: var(--color-global);
 
   // Border colors
-  --border-color-theme: #{$gray-300}; // former: `$navbar-border: $gray-300;`
+  --border-color-theme: #{bs.$gray-300}; // former: `$navbar-border: $gray-300;`
   --bordercolor-inline-code: #4d4d4d; // optional
 
   // admin theme box

+ 3 - 3
packages/preset-themes/vite.themes.config.ts

@@ -13,9 +13,9 @@ export default defineConfig({
         '/src/styles/blackboard.scss',
         '/src/styles/christmas.scss',
         '/src/styles/default.scss',
-        // '/src/styles/fire-red.scss',
-        // '/src/styles/future.scss',
-        // '/src/styles/halloween.scss',
+        '/src/styles/fire-red.scss',
+        '/src/styles/future.scss',
+        '/src/styles/halloween.scss',
         // '/src/styles/hufflepuff.scss',
         // '/src/styles/island.scss',
         // '/src/styles/jade-green.scss',