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

Merge pull request #7966 from weseek/support/128303-128304-build-antarctic

support:  Eble to build antarctic
Ryoji Shimizu 2 лет назад
Родитель
Сommit
c479c72d92

+ 7 - 7
packages/preset-themes/src/styles/antarctic.scss

@@ -1,6 +1,6 @@
 @use '@growi/core/scss/bootstrap/init' as bs;
 @use '@growi/core/scss/bootstrap/init' as bs;
 
 
-@use './variables' as *;
+@use './variables' as var;
 @use './theme/mixins/page-editor-mode-manager';
 @use './theme/mixins/page-editor-mode-manager';
 @use './theme/hsl-functions' as hsl;
 @use './theme/hsl-functions' as hsl;
 
 
@@ -18,10 +18,10 @@
   --bgcolor-global: hsl(var(--bgcolor-global-hs),var(--bgcolor-global-l));
   --bgcolor-global: hsl(var(--bgcolor-global-hs),var(--bgcolor-global-l));
   --bgcolor-global-hs: 208,100%;
   --bgcolor-global-hs: 208,100%;
   --bgcolor-global-l: 97%;
   --bgcolor-global-l: 97%;
-  --bgcolor-inline-code: #{$gray-100}; //optional
-  --bgcolor-card: #{$gray-50};
+  --bgcolor-inline-code: #{bs.$gray-100}; //optional
+  --bgcolor-card: #{bs.$gray-100};
   --bgcolor-blinked-section: #{hsl.alpha(var(--primary), 15%)};
   --bgcolor-blinked-section: #{hsl.alpha(var(--primary), 15%)};
-  //--bgcolor-keyword-highlighted: #{$grw-marker-yellow};
+  --bgcolor-keyword-highlighted: #{var.$grw-marker-yellow};
 
 
   // Font colors
   // Font colors
   --color-global: hsl(var(--color-global-hs),var(--color-global-l));
   --color-global: hsl(var(--color-global-hs),var(--color-global-l));
@@ -66,7 +66,7 @@
 
 
   // Logo colors
   // Logo colors
   --bgcolor-logo: var(--bgcolor-navbar);
   --bgcolor-logo: var(--bgcolor-navbar);
-  --fillcolor-logo-mark: #{lighten(desaturate($gray-100, 10%), 15%)};
+  --fillcolor-logo-mark: #{lighten(desaturate(bs.$gray-100, 10%), 15%)};
 
 
   // Sidebar
   // Sidebar
   --bgcolor-sidebar: var(--primary);
   --bgcolor-sidebar: var(--primary);
@@ -103,12 +103,12 @@
   --color-editor-icons: var(--color-global);
   --color-editor-icons: var(--color-global);
 
 
   // Border colors
   // Border colors
-  --border-color-theme: #{$gray-400};
+  --border-color-theme: #{bs.$gray-400};
   --border-color-global: #{gray-400};
   --border-color-global: #{gray-400};
   --bordercolor-inline-code: #ccc8c8; // optional
   --bordercolor-inline-code: #ccc8c8; // optional
 
 
   // Dropdown colors
   // Dropdown colors
-  --bgcolor-dropdown-link-active: #{$growi-blue};
+  --bgcolor-dropdown-link-active: #{var.$growi-blue};
 
 
   // admin theme box
   // admin theme box
   --color-theme-color-box: #{hsl.lighten(var(--primary), 20%)};
   --color-theme-color-box: #{hsl.lighten(var(--primary), 20%)};

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

@@ -9,7 +9,7 @@ export default defineConfig({
     manifest: true,
     manifest: true,
     rollupOptions: {
     rollupOptions: {
       input: [
       input: [
-        // '/src/styles/antarctic.scss',
+        '/src/styles/antarctic.scss',
         '/src/styles/blackboard.scss',
         '/src/styles/blackboard.scss',
         // '/src/styles/christmas.scss',
         // '/src/styles/christmas.scss',
         '/src/styles/default.scss',
         '/src/styles/default.scss',