Browse Source

Create Icon fill

satof3 2 years ago
parent
commit
e42eb95c30

+ 8 - 8
apps/app/src/components/Admin/Customize/ThemeColorBox.tsx

@@ -15,7 +15,7 @@ export const ThemeColorBox = (props: Props): JSX.Element => {
     isSelected, metadata, onSelected,
     isSelected, metadata, onSelected,
   } = props;
   } = props;
   const {
   const {
-    name, lightBg, darkBg, lightSidebar, darkSidebar, createBtn, isPresetTheme,
+    name, lightBg, darkBg, lightSidebar, darkSidebar, lightIcon, darkIcon, createBtn, isPresetTheme,
   } = metadata;
   } = metadata;
 
 
   return (
   return (
@@ -39,14 +39,14 @@ export const ThemeColorBox = (props: Props): JSX.Element => {
             fill={darkSidebar}
             fill={darkSidebar}
           />
           />
           <path id="btn" d="M22.338,31.19l6.087-10.543L22.338,10.1H10.163L4.077,20.647,10.163,31.19Z" fill={createBtn} />
           <path id="btn" d="M22.338,31.19l6.087-10.543L22.338,10.1H10.163L4.077,20.647,10.163,31.19Z" fill={createBtn} />
-          <g id="icon-d">
-            <path id="icon-3" d="M6.436,49.8l19.629,0V47.742H10l-3.561,1.8Z" fill="#d1d0cc" />
-            <path id="icon-2" d="M26.065,44.106V42.044h-4.8L17.19,44.106Z" fill="#d1d0cc" />
-            <rect id="icon-1" width="19.629" height="2.062" transform="translate(6.436 53.439)" fill="#d1d0cc" />
-          </g>
           <g id="icon-l">
           <g id="icon-l">
-            <path id="icon-2-2" data-name="icon-2" d="M6.436,49.543,10,47.742H6.436Z" fill="#8a8887" />
-            <path id="icon-1-2" data-name="icon-1" d="M6.436,44.106H17.189l4.078-2.062H6.436Z" fill="#8a8887" />
+            <path id="icon-2-2" data-name="icon-2" d="M6.436,49.543,10,47.742H6.436Z" fill={lightIcon} />
+            <path id="icon-1-2" data-name="icon-1" d="M6.436,44.106H17.189l4.078-2.062H6.436Z" fill={lightIcon} />
+          </g>
+          <g id="icon-d">
+            <path id="icon-3" d="M6.436,49.8l19.629,0V47.742H10l-3.561,1.8Z" fill={darkIcon} />
+            <path id="icon-2" d="M26.065,44.106V42.044h-4.8L17.19,44.106Z" fill={darkIcon} />
+            <rect id="icon-1" width="19.629" height="2.062" transform="translate(6.436 53.439)" fill={darkIcon} />
           </g>
           </g>
         </svg>
         </svg>
         {/* <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64">
         {/* <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64">

+ 2 - 0
packages/core/src/interfaces/growi-theme-metadata.ts

@@ -14,6 +14,8 @@ export type GrowiThemeMetadata = {
   darkBg: string,
   darkBg: string,
   lightSidebar: string,
   lightSidebar: string,
   darkSidebar: string,
   darkSidebar: string,
+  lightIcon: string,
+  darkIcon: string,
   createBtn: string,
   createBtn: string,
   isPresetTheme?: boolean,
   isPresetTheme?: boolean,
 };
 };

+ 32 - 0
packages/preset-themes/src/consts/preset-themes.ts

@@ -32,6 +32,8 @@ export const DefaultThemeMetadata: GrowiThemeMetadata = {
   darkBg: '#1C1A1A',
   darkBg: '#1C1A1A',
   lightSidebar: '#F8F7F7',
   lightSidebar: '#F8F7F7',
   darkSidebar: '#434240',
   darkSidebar: '#434240',
+  lightIcon: '#8A8887',
+  darkIcon: '#D1D0CC',
   createBtn: '#007EB0',
   createBtn: '#007EB0',
   isPresetTheme: true,
   isPresetTheme: true,
 };
 };
@@ -46,6 +48,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#16202C',
     darkBg: '#16202C',
     lightSidebar: '#EDFAFD',
     lightSidebar: '#EDFAFD',
     darkSidebar: '#0A2E53',
     darkSidebar: '#0A2E53',
+    lightIcon: '#36819C',
+    darkIcon: '#69B0C7',
     createBtn: '#439CB9',
     createBtn: '#439CB9',
   }, {
   }, {
     name: PresetThemes.HUFFLEPUFF,
     name: PresetThemes.HUFFLEPUFF,
@@ -54,6 +58,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#16202C',
     darkBg: '#16202C',
     lightSidebar: '#FEEBA5',
     lightSidebar: '#FEEBA5',
     darkSidebar: '#5C4209',
     darkSidebar: '#5C4209',
+    lightIcon: '#B88512',
+    darkIcon: '#EBB845',
     createBtn: '#403C39',
     createBtn: '#403C39',
   }, {
   }, {
     name: PresetThemes.FIRE_RED,
     name: PresetThemes.FIRE_RED,
@@ -62,6 +68,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#120700',
     darkBg: '#120700',
     lightSidebar: '#FADDD6',
     lightSidebar: '#FADDD6',
     darkSidebar: '#5A4F4A',
     darkSidebar: '#5A4F4A',
+    lightIcon: '#94351E',
+    darkIcon: '#EE775B',
     createBtn: '#EA5532',
     createBtn: '#EA5532',
   }, {
   }, {
     name: PresetThemes.JADE_GREEN,
     name: PresetThemes.JADE_GREEN,
@@ -70,6 +78,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#120700',
     darkBg: '#120700',
     lightSidebar: '#F1F3F2',
     lightSidebar: '#F1F3F2',
     darkSidebar: '#4B4E4C',
     darkSidebar: '#4B4E4C',
+    lightIcon: '#3A8F6F',
+    darkIcon: '#5FC2A2',
     createBtn: '#49B38A',
     createBtn: '#49B38A',
   }, {
   }, {
     name: PresetThemes.CLASSIC,
     name: PresetThemes.CLASSIC,
@@ -78,6 +88,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#151A1F',
     darkBg: '#151A1F',
     lightSidebar: '#F0F4FA',
     lightSidebar: '#F0F4FA',
     darkSidebar: '#29343F',
     darkSidebar: '#29343F',
+    lightIcon: '#53687E',
+    darkIcon: '#869BB1',
     createBtn: '#3491CB',
     createBtn: '#3491CB',
   },
   },
   // light only
   // light only
@@ -88,6 +100,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#FAF9F8',
     darkBg: '#FAF9F8',
     lightSidebar: '#EBF9CC',
     lightSidebar: '#EBF9CC',
     darkSidebar: '#D8F399',
     darkSidebar: '#D8F399',
+    lightIcon: '#3F8421',
+    darkIcon: '#1F4210',
     createBtn: '#4FA529',
     createBtn: '#4FA529',
   }, {
   }, {
     name: PresetThemes.WOOD,
     name: PresetThemes.WOOD,
@@ -96,6 +110,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#FDFAF0',
     darkBg: '#FDFAF0',
     lightSidebar: '#EAE3D4',
     lightSidebar: '#EAE3D4',
     darkSidebar: '#DCCBA6',
     darkSidebar: '#DCCBA6',
+    lightIcon: '#86651A',
+    darkIcon: '#43320D',
     createBtn: '#A77E21',
     createBtn: '#A77E21',
   }, {
   }, {
     name: PresetThemes.ISLAND,
     name: PresetThemes.ISLAND,
@@ -104,6 +120,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#E8F7FA',
     darkBg: '#E8F7FA',
     lightSidebar: '#F3EEE0',
     lightSidebar: '#F3EEE0',
     darkSidebar: '#E8DDC0',
     darkSidebar: '#E8DDC0',
+    lightIcon: '#51C2D3',
+    darkIcon: '#204D54',
     createBtn: '#51C2D3',
     createBtn: '#51C2D3',
   }, {
   }, {
     name: PresetThemes.CHRISTMAS,
     name: PresetThemes.CHRISTMAS,
@@ -112,6 +130,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#323D52',
     darkBg: '#323D52',
     lightSidebar: '#2E3E27',
     lightSidebar: '#2E3E27',
     darkSidebar: '#455D3B',
     darkSidebar: '#455D3B',
+    lightIcon: '#DC7870',
+    darkIcon: '#E7A59F',
     createBtn: '#B90606',
     createBtn: '#B90606',
   }, {
   }, {
     name: PresetThemes.ANTARCTIC,
     name: PresetThemes.ANTARCTIC,
@@ -120,6 +140,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#E5FAFF',
     darkBg: '#E5FAFF',
     lightSidebar: '#EDF4FC',
     lightSidebar: '#EDF4FC',
     darkSidebar: '#DBE9F9',
     darkSidebar: '#DBE9F9',
+    lightIcon: '#2631AF',
+    darkIcon: '#131857',
     createBtn: '#303DDB',
     createBtn: '#303DDB',
   }, {
   }, {
     name: PresetThemes.SPRING,
     name: PresetThemes.SPRING,
@@ -128,6 +150,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#FFFDF5',
     darkBg: '#FFFDF5',
     lightSidebar: '#FEE7EB',
     lightSidebar: '#FEE7EB',
     darkSidebar: '#F9CED7',
     darkSidebar: '#F9CED7',
+    lightIcon: '#D76F7D',
+    darkIcon: '#8A423F',
     createBtn: '#6ABA55',
     createBtn: '#6ABA55',
   }, {
   }, {
     name: PresetThemes.KIBELA,
     name: PresetThemes.KIBELA,
@@ -136,6 +160,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#F5F5F5',
     darkBg: '#F5F5F5',
     lightSidebar: '#FFFFFF',
     lightSidebar: '#FFFFFF',
     darkSidebar: '#F5F5F5',
     darkSidebar: '#F5F5F5',
+    lightIcon: '#737373',
+    darkIcon: '#525252',
     createBtn: '#3080C0',
     createBtn: '#3080C0',
   },
   },
   // dark only
   // dark only
@@ -146,6 +172,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#1F4C4D',
     darkBg: '#1F4C4D',
     lightSidebar: '#2a2929',
     lightSidebar: '#2a2929',
     darkSidebar: '#27413D',
     darkSidebar: '#27413D',
+    lightIcon: '#3F999B',
+    darkIcon: '#99E5E6',
     createBtn: '#03A2A8',
     createBtn: '#03A2A8',
   }, {
   }, {
     name: PresetThemes.HALLOWEEN,
     name: PresetThemes.HALLOWEEN,
@@ -154,6 +182,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#2F1155',
     darkBg: '#2F1155',
     lightSidebar: '#2F1155',
     lightSidebar: '#2F1155',
     darkSidebar: '#3B136C',
     darkSidebar: '#3B136C',
+    lightIcon: '#8C3C03',
+    darkIcon: '#DDB69B',
     createBtn: '#AA4A04',
     createBtn: '#AA4A04',
   }, {
   }, {
     name: PresetThemes.BLACKBOARD,
     name: PresetThemes.BLACKBOARD,
@@ -162,6 +192,8 @@ export const PresetThemesMetadatas: GrowiThemeMetadata[] = [
     darkBg: '#213E23',
     darkBg: '#213E23',
     lightSidebar: '#1B431C',
     lightSidebar: '#1B431C',
     darkSidebar: '#29652B',
     darkSidebar: '#29652B',
+    lightIcon: '#C89D3B',
+    darkIcon: '#E3CE9D',
     createBtn: '#BA840A',
     createBtn: '#BA840A',
   },
   },
 ]
 ]

+ 2 - 0
packages/preset-themes/src/interfaces/growi-theme-metadata.ts

@@ -13,6 +13,8 @@ export type GrowiThemeMetadata = {
   darkBg: string,
   darkBg: string,
   lightSidebar: string,
   lightSidebar: string,
   darkSidebar: string,
   darkSidebar: string,
+  lightIcon: string,
+  darkIcon: string,
   createBtn: string,
   createBtn: string,
   isPresetTheme?: boolean,
   isPresetTheme?: boolean,
 };
 };