Merge pull request #183 from COW-dev/feat/DDING-33

[DDING-33] 할로윈 로고 변경
COW-dev · Oct 19, 2024 · 71fb4e4 · 71fb4e4
2 parents 6bb2a70 + 61b21ba
commit 71fb4e4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/public/halloweenLogo.png b/public/halloweenLogo.png
diff --git a/public/m_halloweenLogo.png b/public/m_halloweenLogo.png
diff --git a/src/assets/cancel-white.svg b/src/assets/cancel-white.svg
diff --git a/src/components/common/Drawer.tsx b/src/components/common/Drawer.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import Image from 'next/image';
-import Cancel from '@/assets/cancel.svg';
-import MiniLogo from '@/assets/miniLogo.svg';
+import Cancel from '@/assets/cancel-white.svg';
 
 type DrawerProps = {
   children: React.ReactNode;
@@ -26,14 +25,14 @@ export default function Drawer({ children, isOpen, setIsOpen }: DrawerProps) {
         }
       >
         <article className="relative flex h-16 w-full justify-between">
-          <header className="flex w-full justify-between bg-blue-600 px-6 text-lg font-bold">
+          <header className="flex w-full items-center justify-between bg-halloween px-6 text-lg font-bold">
             <Image
-              src={MiniLogo}
-              width={1544}
-              height={380}
+              src={'/m_halloweenLogo.png'}
+              width={1500}
+              height={700}
               priority
               alt="ddingdong"
-              className="w-34"
+              className="h-10 w-36 "
             />
             <button
               className=""

diff --git a/src/components/feed/Tabs.tsx b/src/components/feed/Tabs.tsx
@@ -41,8 +41,8 @@ export default function Tabs({ TabMenus, tabContext }: Props) {
                 } shrink-0 border-b-2 pb-4 text-base font-medium md:text-xl md:font-semibold
                    ${
                      activeTab === tab.label
-                       ? 'border-blue-500 text-blue-500'
-                       : 'border-transparent text-gray-500 hover:border-blue-500 hover:text-blue-500'
+                       ? 'border-halloween text-halloween'
+                       : 'border-transparent text-gray-500 hover:border-halloween hover:text-halloween'
                    }`}
                 aria-current={activeTab === tab.label ? 'page' : undefined}
               >

diff --git a/src/components/home/FilterCategory.tsx b/src/components/home/FilterCategory.tsx
@@ -20,7 +20,7 @@ function FilterCategory({ option, setOption }: Props) {
     <div className="my-2 hidden w-full rounded-xl bg-gray-50 p-2 px-4 font-semibold text-gray-500 md:flex">
       <span
         className={`cursor-pointer ${
-          option.category.length === 0 && 'text-blue-500'
+          option.category.length === 0 && 'text-halloween'
         }`}
         onClick={() => setOption((prev) => ({ ...prev, category: [] }))}
       >
@@ -30,7 +30,7 @@ function FilterCategory({ option, setOption }: Props) {
         <div
           onClick={() => filterCategory(category.title)}
           className={`cursor-pointer before:p-2 before:text-gray-300 before:content-['|'] ${
-            option.category.includes(category.title) && 'text-blue-500'
+            option.category.includes(category.title) && 'text-halloween'
           }`}
           key={`category${index}`}
         >

diff --git a/src/components/layout/AdminHeader.tsx b/src/components/layout/AdminHeader.tsx
@@ -18,7 +18,7 @@ export default function AdminHeader() {
           className="-ml-3 inline-block p-3"
         >
           <Image
-            src={'/logo.png'}
+            src={'/halloweenLogo.png'}
             width={1544}
             height={380}
             priority

diff --git a/src/components/layout/UserHeader.tsx b/src/components/layout/UserHeader.tsx
@@ -60,7 +60,7 @@ export default function UserHeader() {
       <div className="flex w-full items-center justify-between px-6">
         <Link href="/" className="inline-block p-3">
           <Image
-            src={'/logo.png'}
+            src={'/halloweenLogo.png'}
             width={1544}
             height={380}
             priority
@@ -111,7 +111,7 @@ export default function UserHeader() {
                               target={category === 'SNS' ? '_blank' : '_self'}
                               rel="noopener noreferrer"
                               onClick={() => setIsOpen(false)}
-                              className="text-md flex items-center font-semibold text-gray-500 hover:text-blue-500"
+                              className="text-md flex items-center font-semibold text-gray-500 hover:text-halloween"
                             >
                               {item.image && (
                                 <Image
@@ -147,7 +147,7 @@ export default function UserHeader() {
         >
           <Link href="/" className="-ml-3 inline-block p-3">
             <Image
-              src={'/logo.png'}
+              src={'/halloweenLogo.png'}
               width={1544}
               height={380}
               priority
@@ -161,15 +161,15 @@ export default function UserHeader() {
                 {category === '동아리피드' ? (
                   <Link
                     href={navItems[category][0].href}
-                    className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-blue-500 focus:outline-none"
+                    className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-halloween focus:outline-none"
                   >
                     {category}
                   </Link>
                 ) : (
                   <div>
                     <button
                       onClick={() => handleDropdownToggle(category)}
-                      className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-blue-500 focus:outline-none"
+                      className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-halloween focus:outline-none"
                     >
                       {category}
                     </button>

diff --git a/src/components/modal/FilterOption.tsx b/src/components/modal/FilterOption.tsx
@@ -93,7 +93,7 @@ export default function FilterOption({
             key={`filter-${item}`}
             onClick={() => handleOption(item)}
             className={`mb-1.5 cursor-pointer font-semibold  md:mb-2 ${
-              item === active ? `border-b text-blue-500` : `text-gray-500`
+              item === active ? `border-b text-halloween` : `text-gray-500`
             } ${item === '카테고리' && 'md:hidden'}`}
           >
             <span>{item}</span>

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -22,7 +22,9 @@ module.exports = {
         112: '28rem',
         128: '32rem',
       },
-      colors: {},
+      colors: {
+        halloween: '#F97316',
+      },
       keyframes: {
         'accordion-down': {
           from: { height: '0' },