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

reorganize scss files for theming

Yuki Takei 2 лет назад
Родитель
Сommit
035843d33c

+ 0 - 4
apps/app/src/styles/_variables.scss

@@ -1,7 +1,3 @@
-//== GROWI Official Color
-$growi-green: #74bc46;
-$growi-blue: #175fa5;
-
 //== Marker Color
 //== Marker Color
 $grw-marker-yellow: #ff6;
 $grw-marker-yellow: #ff6;
 $grw-marker-red: #f6c;
 $grw-marker-red: #f6c;

+ 3 - 0
packages/core/scss/_growi-official-colors.scss

@@ -0,0 +1,3 @@
+//== GROWI Official Color
+$growi-green: #74bc46;
+$growi-blue: #175fa5;

+ 1 - 4
packages/core/scss/bootstrap/_init.scss

@@ -1,13 +1,10 @@
 @import 'bootstrap/scss/functions';
 @import 'bootstrap/scss/functions';
 
 
+@import '../growi-official-colors';
 @import './variables';
 @import './variables';
 @import 'bootstrap/scss/variables';
 @import 'bootstrap/scss/variables';
 @import 'bootstrap/scss/variables-dark';
 @import 'bootstrap/scss/variables-dark';
 
 
 @import 'bootstrap/scss/maps';
 @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);
-
 @import 'bootstrap/scss/mixins';
 @import 'bootstrap/scss/mixins';
 @import 'bootstrap/scss/utilities';
 @import 'bootstrap/scss/utilities';

+ 6 - 27
packages/core/scss/bootstrap/_variables.scss

@@ -1,34 +1,13 @@
 // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 // TODO: activate (https://redmine.weseek.co.jp/issues/128307)
 
 
-//
 // Variables
 // Variables
-// --------------------------------------------------
-
-//== Colors
 //
 //
-// $primary: variables.$growi-blue !default;
-// $secondary: #6c757d !default;
-// $info: #009fbb !default;
-// $success: #00bb83 !default;
-// $warning: #ffa32b !default;
-// $danger: #ff0a54 !default;
-// $light: #e4e7ea !default;
-// $dark: #343a40 !default;
-// $gray-50: lighten($light, 7%) !default;
-// $gray-100: lighten($light, 4%) !default;
-// $gray-200: $light !default;
-// $gray-300: darken($light, 5%) !default;
-// $gray-400: darken($light, 20%) !default;
-// $gray-500: darken($light, 30%) !default;
-// $gray-550: lighten($dark, 15%) !default;
-// $gray-600: lighten($dark, 10%) !default;
-// $gray-700: lighten($dark, 5%) !default;
-// $gray-800: $dark !default;
-// $gray-900: darken($dark, 5%) !default;
-// $grays: (
-//   '50': $gray-50,
-// ) !default;
-// $red: #ff0a54 !default;
+// Variables should follow the `$component-state-property-size` formula for
+// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
+
+// Color system
+
+@import './theming/variables';
 
 
 // Options
 // Options
 //
 //

+ 16 - 0
packages/core/scss/bootstrap/theming/_variables.scss

@@ -0,0 +1,16 @@
+// Variables
+//
+// Variables should follow the `$component-state-property-size` formula for
+// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
+
+// Color system
+
+$gray-100: #d2d0ce !default;
+$gray-200: #c9c7c7 !default;
+$gray-300: #bab8b8 !default;
+$gray-400: #adaaaa !default;
+$gray-500: #9a9898 !default;
+$gray-600: #8a8886 !default;
+$gray-700: #585755 !default;
+$gray-800: #323130 !default;
+$gray-900: #171615 !default;

+ 0 - 10
packages/preset-themes/src/styles/_variables.scss

@@ -1,10 +0,0 @@
-//== GROWI Official Color
-$growi-green: #74bc46;
-$growi-blue: #175fa5;
-
-//== Marker Color
-$grw-marker-yellow: #ff6;
-$grw-marker-red: #f6c;
-$grw-marker-blue: #6cf;
-$grw-marker-cyan: #6ff;
-$grw-marker-green: #6f6;

+ 14 - 0
packages/preset-themes/src/styles/bootstrap/_init.scss

@@ -0,0 +1,14 @@
+@import 'bootstrap/scss/functions';
+
+@import '@growi/core/scss/growi-official-colors';
+@import '@growi/core/scss/bootstrap/theming/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);
+
+@import 'bootstrap/scss/mixins';
+@import 'bootstrap/scss/utilities';