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

separate theme styles from style-next.scss

Yuki Takei 3 лет назад
Родитель
Сommit
4249ec4c27
25 измененных файлов с 38 добавлено и 41 удалено
  1. 2 2
      packages/app/src/components/Theme/ThemeAntarctic.global.scss
  2. 2 2
      packages/app/src/components/Theme/ThemeBlackboard.global.scss
  3. 2 2
      packages/app/src/components/Theme/ThemeChristmas.global.scss
  4. 2 2
      packages/app/src/components/Theme/ThemeDefault.global.scss
  5. 2 2
      packages/app/src/components/Theme/ThemeFireRed.global.scss
  6. 2 2
      packages/app/src/components/Theme/ThemeFuture.global.scss
  7. 2 2
      packages/app/src/components/Theme/ThemeHalloween.global.scss
  8. 2 2
      packages/app/src/components/Theme/ThemeHufflepuff.global.scss
  9. 2 2
      packages/app/src/components/Theme/ThemeIsland.global.scss
  10. 2 2
      packages/app/src/components/Theme/ThemeJadeGreen.global.scss
  11. 2 2
      packages/app/src/components/Theme/ThemeKibela.global.scss
  12. 2 2
      packages/app/src/components/Theme/ThemeMonoBlue.global.scss
  13. 2 2
      packages/app/src/components/Theme/ThemeNature.global.scss
  14. 2 2
      packages/app/src/components/Theme/ThemeSpring.global.scss
  15. 2 2
      packages/app/src/components/Theme/ThemeWood.global.scss
  16. 1 1
      packages/app/src/pages/_app.page.tsx
  17. 0 3
      packages/app/src/styles/style-next.scss
  18. 0 0
      packages/app/src/styles/style-themes.scss
  19. 1 1
      packages/app/src/styles/theme/_apply-colors-dark.scss
  20. 1 1
      packages/app/src/styles/theme/_apply-colors-light.scss
  21. 1 1
      packages/app/src/styles/theme/_apply-colors.scss
  22. 1 1
      packages/app/src/styles/theme/_reboot-bootstrap-border-colors.scss
  23. 1 1
      packages/app/src/styles/theme/_reboot-bootstrap-dropdown.scss
  24. 1 1
      packages/app/src/styles/theme/_reboot-bootstrap-tables.scss
  25. 1 1
      packages/app/src/styles/theme/_reboot-bootstrap-theme-colors.scss

+ 2 - 2
packages/app/src/components/Theme/ThemeAntarctic.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

+ 2 - 2
packages/app/src/components/Theme/ThemeBlackboard.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 :root .theme-blackboard {
 :root .theme-blackboard {

+ 2 - 2
packages/app/src/components/Theme/ThemeChristmas.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

+ 2 - 2
packages/app/src/components/Theme/ThemeDefault.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

+ 2 - 2
packages/app/src/components/Theme/ThemeFireRed.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 :root[data-theme='light'] .theme-fire-red {
 :root[data-theme='light'] .theme-fire-red {

+ 2 - 2
packages/app/src/components/Theme/ThemeFuture.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 $primary: #00b5b7;
 $primary: #00b5b7;

+ 2 - 2
packages/app/src/components/Theme/ThemeHalloween.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 $themecolor: #aa4a04;
 $themecolor: #aa4a04;

+ 2 - 2
packages/app/src/components/Theme/ThemeHufflepuff.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

+ 2 - 2
packages/app/src/components/Theme/ThemeIsland.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/mixins';
 @use '../../styles/mixins';
 
 

+ 2 - 2
packages/app/src/components/Theme/ThemeJadeGreen.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 :root[data-theme='light'] .theme-jade-green {
 :root[data-theme='light'] .theme-jade-green {

+ 2 - 2
packages/app/src/components/Theme/ThemeKibela.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 $bgcolor-theme: rgb(18, 86, 163);
 $bgcolor-theme: rgb(18, 86, 163);

+ 2 - 2
packages/app/src/components/Theme/ThemeMonoBlue.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 :root[data-theme='light'] .theme-mono-blue {
 :root[data-theme='light'] .theme-mono-blue {

+ 2 - 2
packages/app/src/components/Theme/ThemeNature.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

+ 2 - 2
packages/app/src/components/Theme/ThemeSpring.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/bootstrap/init' as bs;
 @use '../../styles/bootstrap/init' as bs;
 
 

+ 2 - 2
packages/app/src/components/Theme/ThemeWood.global.scss

@@ -1,5 +1,5 @@
-// @use '../../styles/variables' as *;
-// @use '../../styles/bootstrap/variables' as *;
+@use '../../styles/variables' as *;
+@use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 
 // == Define Bootstrap theme colors
 // == Define Bootstrap theme colors

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

@@ -6,7 +6,7 @@ import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 
 
 import '~/styles/style-next.scss';
 import '~/styles/style-next.scss';
-// import '~/styles/theme/default.scss';
+import '~/styles/style-themes.scss';
 // import InterceptorManager from '~/service/interceptor-manager';
 // import InterceptorManager from '~/service/interceptor-manager';
 
 
 import * as nextI18nConfig from '^/config/next-i18next.config';
 import * as nextI18nConfig from '^/config/next-i18next.config';

+ 0 - 3
packages/app/src/styles/style-next.scss

@@ -77,9 +77,6 @@
 // @import 'sharelink';
 // @import 'sharelink';
 // @import 'linkedit-preview';
 // @import 'linkedit-preview';
 
 
-// themes
-@import './theme/all-themes';
-
 
 
 /*
 /*
  * for Guest User Mode
  * for Guest User Mode

+ 0 - 0
packages/app/src/styles/theme/_all-themes.scss → packages/app/src/styles/style-themes.scss


+ 1 - 1
packages/app/src/styles/theme/_apply-colors-dark.scss

@@ -1,5 +1,5 @@
 @use '../variables' as var;
 @use '../variables' as var;
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 @use '../mixins';
 @use '../mixins';
 @use './mixins/count-badge';
 @use './mixins/count-badge';
 
 

+ 1 - 1
packages/app/src/styles/theme/_apply-colors-light.scss

@@ -1,5 +1,5 @@
 @use '../variables' as var;
 @use '../variables' as var;
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 @use '../mixins';
 @use '../mixins';
 @use './mixins/count-badge';
 @use './mixins/count-badge';
 
 

+ 1 - 1
packages/app/src/styles/theme/_apply-colors.scss

@@ -1,5 +1,5 @@
 @use '../variables' as var;
 @use '../variables' as var;
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 @use '../mixins';
 @use '../mixins';
 @use './mixins/tables'; // comment out and use _reboot-bootstrap-tables instead -- 2020.05.28 Yuki Takei
 @use './mixins/tables'; // comment out and use _reboot-bootstrap-tables instead -- 2020.05.28 Yuki Takei
 
 

+ 1 - 1
packages/app/src/styles/theme/_reboot-bootstrap-border-colors.scss

@@ -1,4 +1,4 @@
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 
 
 //
 //
 // Border
 // Border

+ 1 - 1
packages/app/src/styles/theme/_reboot-bootstrap-dropdown.scss

@@ -1,4 +1,4 @@
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 
 
 .dropdown-menu {
 .dropdown-menu {
   color: $dropdown-color;
   color: $dropdown-color;

+ 1 - 1
packages/app/src/styles/theme/_reboot-bootstrap-tables.scss

@@ -1,4 +1,4 @@
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 
 
 //
 //
 //
 //

+ 1 - 1
packages/app/src/styles/theme/_reboot-bootstrap-theme-colors.scss

@@ -1,4 +1,4 @@
-// @use '../bootstrap/init' as *;
+@use '../bootstrap/init' as *;
 @use '../mixins';
 @use '../mixins';
 
 
 @each $color, $value in $theme-colors {
 @each $color, $value in $theme-colors {