Yuki Takei 3 лет назад
Родитель
Сommit
6541597833

+ 1 - 0
packages/app/src/pages/_app.page.tsx

@@ -19,6 +19,7 @@ import { CommonProps } from './utils/commons';
 import { registerTransformerForObjectId } from './utils/objectid-transformer';
 
 import '~/styles/style-app.scss';
+import '~/styles/theme/_apply-colors.scss';
 
 
 const isDev = process.env.NODE_ENV === 'development';

+ 2 - 2
packages/preset-themes/src/styles/default.scss

@@ -126,7 +126,7 @@
   $color-theme-color-box: lighten($primary, 20%);
 
   @import './theme/apply-colors';
-  @import './theme/apply-colors-light';
+  // @import './theme/apply-colors-light';
   // @import '/packages/app/src/styles/theme/apply-colors-light-new';
 
   // Button
@@ -241,7 +241,7 @@
   $color-theme-color-box: $primary;
 
   @import './theme/apply-colors';
-  @import './theme/apply-colors-dark';
+  // @import './theme/apply-colors-dark';
 
   // @import '/packages/app/src/styles/theme/apply-colors-dark-new';
 

+ 0 - 1
packages/preset-themes/src/styles/theme/_apply-colors.scss

@@ -40,7 +40,6 @@ $theme-colors: map-merge($theme-colors, ( primary: $primary ));
 
 @import 'reboot-bootstrap-buttons';
 @import 'reboot-bootstrap-colors';
-@import 'reboot-bootstrap-theme-colors';
 @import 'reboot-bootstrap-nav';
 @import 'reboot-toastr-colors';
 

+ 0 - 92
packages/preset-themes/src/styles/theme/_reboot-bootstrap-theme-colors.scss

@@ -1,92 +0,0 @@
-@use '../bootstrap/init' as *;
-@use '../atoms/mixins/buttons' as mixins-buttons;
-
-@each $color, $value in $theme-colors {
-  @include bg-variant('.bg-#{$color}', $value);
-}
-
-@each $color, $value in $theme-colors {
-  .border-#{$color} {
-    border-color: $value !important;
-  }
-}
-
-@each $color, $value in $theme-colors {
-  @include text-emphasis-variant('.text-#{$color}', $value, true);
-}
-
-@each $color, $value in $theme-colors {
-  .btn-#{$color} {
-    @include button-variant($value, $value);
-    @include mixins-buttons.button-svg-icon-variant($value, $value);
-    box-shadow: none !important;
-  }
-}
-
-@each $color, $value in $theme-colors {
-  .btn-outline-#{$color} {
-    @include button-outline-variant($value, $color-hover: $value, $active-background: rgba($value, 0.1), $active-border: $value);
-    @include mixins-buttons.button-outline-svg-icon-variant($value, $color-hover: $value);
-
-    &:not(:disabled):not(.disabled):active,
-    &:not(:disabled):not(.disabled).active {
-      color: $value;
-      background-color: rgba($value, 0.1);
-      border-color: $value;
-    }
-
-    box-shadow: none !important;
-  }
-
-  // separate style: https://github.com/weseek/growi/pull/6804
-  .show > .btn-outline-#{$color}.dropdown-toggle {
-    color: $value;
-    background-color: rgba($value, 0.1);
-    border-color: $value;
-  }
-}
-
-@each $theme-color, $color in $theme-colors {
-  .custom-checkbox-#{$theme-color} {
-    .custom-control-label::before {
-      border-color: $input-border-color;
-      transition: 0.3s ease-in-out;
-    }
-    .custom-control-input:checked + .custom-control-label::before {
-      background-color: $color;
-      border-color: $color;
-    }
-    .custom-control-input:checked + .custom-control-label::after {
-      color: var(--bgcolor-global);
-    }
-    .custom-control-input:not(:disabled):active ~ .custom-control-label::before {
-      color: var(--bgcolor-global);
-      background-color: $color;
-      border-color: $color;
-    }
-    .custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
-      color: var(--bgcolor-global);
-      background-color: var(--bgcolor-global);
-      border-color: $input-focus-border-color;
-    }
-  }
-}
-
-@each $color, $value in $theme-colors {
-  .alert-#{$color} {
-    @include alert-variant(
-      theme-color-level($color, $alert-bg-level),
-      theme-color-level($color, $alert-border-level),
-      theme-color-level($color, $alert-color-level)
-    );
-  }
-}
-
-@each $color, $value in $theme-colors {
-  .badge-#{$color} {
-    @include badge-variant($value);
-  }
-  a.badge-#{$color} {
-    @include badge-variant($value);
-  }
-}

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

@@ -7,21 +7,21 @@ export default defineConfig({
     manifest: true,
     rollupOptions: {
       input: [
-        '/src/styles/antarctic.scss',
-        '/src/styles/blackboard.scss',
-        '/src/styles/christmas.scss',
+        // '/src/styles/antarctic.scss',
+        // '/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/hufflepuff.scss',
-        '/src/styles/island.scss',
-        '/src/styles/jade-green.scss',
-        '/src/styles/kibela.scss',
-        '/src/styles/mono-blue.scss',
-        '/src/styles/nature.scss',
-        '/src/styles/spring.scss',
-        '/src/styles/wood.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',
+        // '/src/styles/kibela.scss',
+        // '/src/styles/mono-blue.scss',
+        // '/src/styles/nature.scss',
+        // '/src/styles/spring.scss',
+        // '/src/styles/wood.scss',
       ],
     },
   },