ソースを参照

putback diffs to applytheme jade-green

yohei0125 3 年 前
コミット
8ec9c517b1

+ 10 - 11
packages/app/src/components/Theme/ThemeJadeGreen.module.scss

@@ -1,8 +1,7 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
-@use '../../styles/theme/mixins/page-editor-mode-manager';
+@import '../variables';
+@import '../override-bootstrap-variables';
 
 
-.theme[data-color-scheme='light'] :global {
+html[light] {
   // Theme colors
   // Theme colors
   $themecolor: #38b48b;
   $themecolor: #38b48b;
   $themelight: #ffffff;
   $themelight: #ffffff;
@@ -71,8 +70,8 @@
   // admin theme box
   // admin theme box
   $color-theme-color-box: $primary;
   $color-theme-color-box: $primary;
 
 
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-light';
+  @import 'apply-colors';
+  @import 'apply-colors-light';
 
 
   // Navs {
   // Navs {
   .nav-tabs {
   .nav-tabs {
@@ -90,12 +89,12 @@
   // Button
   // Button
   .btn-group.grw-page-editor-mode-manager {
   .btn-group.grw-page-editor-mode-manager {
     .btn.btn-outline-primary {
     .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+      @include btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
     }
     }
   }
   }
 }
 }
 
 
-.theme[data-color-scheme='dark'] :global {
+html[dark] {
   // Theme colors
   // Theme colors
   $themecolor: #38b48b;
   $themecolor: #38b48b;
   $themedark: #333333;
   $themedark: #333333;
@@ -172,8 +171,8 @@
   // admin theme box
   // admin theme box
   $color-theme-color-box: $primary;
   $color-theme-color-box: $primary;
 
 
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-dark';
+  @import 'apply-colors';
+  @import 'apply-colors-dark';
 
 
   // Navs
   // Navs
   .nav-tabs {
   .nav-tabs {
@@ -199,7 +198,7 @@
   // Button
   // Button
   .btn-group.grw-page-editor-mode-manager {
   .btn-group.grw-page-editor-mode-manager {
     .btn.btn-outline-primary {
     .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
+      @include btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
     }
     }
   }
   }
 }
 }

+ 0 - 8
packages/app/src/components/Theme/ThemeJadeGreen.tsx

@@ -1,8 +0,0 @@
-import { ThemeInjector } from './utils/ThemeInjector';
-
-import styles from './ThemeJadeGreen.module.scss';
-
-const ThemeJadeGreen = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
-};
-export default ThemeJadeGreen;

+ 0 - 3
packages/app/src/components/Theme/utils/ThemeProvider.tsx

@@ -10,7 +10,6 @@ const ThemeAntarctic = dynamic(() => import('../ThemeAntarctic'));
 const ThemeBlackboard = dynamic(() => import('../ThemeBlackboard'));
 const ThemeBlackboard = dynamic(() => import('../ThemeBlackboard'));
 const ThemeChristmas = dynamic(() => import('../ThemeChristmas'));
 const ThemeChristmas = dynamic(() => import('../ThemeChristmas'));
 const ThemeDefault = dynamic(() => import('../ThemeDefault'));
 const ThemeDefault = dynamic(() => import('../ThemeDefault'));
-const ThemeJadeGreen = dynamic(() => import('../ThemeJadeGreen'));
 
 
 
 
 type Props = {
 type Props = {
@@ -26,8 +25,6 @@ export const ThemeProvider = ({ theme, children }: Props): JSX.Element => {
       return <ThemeBlackboard>{children}</ThemeBlackboard>;
       return <ThemeBlackboard>{children}</ThemeBlackboard>;
     case GrowiThemes.CHRISTMAS:
     case GrowiThemes.CHRISTMAS:
       return <ThemeChristmas>{children}</ThemeChristmas>;
       return <ThemeChristmas>{children}</ThemeChristmas>;
-    case GrowiThemes.JADE_GREEN:
-      return <ThemeJadeGreen>{children}</ThemeJadeGreen>;
     default:
     default:
       return <ThemeDefault>{children}</ThemeDefault>;
       return <ThemeDefault>{children}</ThemeDefault>;
   }
   }