Skip to content

Commit

Permalink
Merge pull request #197 from COW-dev/style/DDING-43
Browse files Browse the repository at this point in the history
할로윈 로고/색상 제거
  • Loading branch information
keemsebin authored Nov 24, 2024
2 parents fc648c3 + 7741960 commit 6e77748
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 31 deletions.
Binary file removed public/halloweenLogo.png
Binary file not shown.
Binary file removed public/m_halloweenLogo.png
Binary file not shown.
Binary file added public/m_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions src/assets/miniLogo.svg

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/common/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,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 items-center justify-between bg-halloween px-6 text-lg font-bold">
<header className="flex w-full items-center justify-between bg-blue-600 px-6 text-lg font-bold">
<Image
src={'/m_halloweenLogo.png'}
src={'/m_logo.png'}
width={1500}
height={700}
priority
alt="ddingdong"
className="h-10 w-36 "
className="w-30 md:w-34"
/>
<button
className=""
Expand Down
4 changes: 2 additions & 2 deletions src/components/feed/Tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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-halloween text-halloween'
: 'border-transparent text-gray-500 hover:border-halloween hover:text-halloween'
? 'border-blue-500 text-blue-500'
: 'border-transparent text-gray-500 hover:border-blue-500 hover:text-blue-500'
}`}
aria-current={activeTab === tab.label ? 'page' : undefined}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/home/FilterCategory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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-halloween'
option.category.length === 0 && 'text-blue-500'
}`}
onClick={() => setOption((prev) => ({ ...prev, category: [] }))}
>
Expand All @@ -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-halloween'
option.category.includes(category.title) && 'text-blue-500'
}`}
key={`category${index}`}
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/AdminHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function AdminHeader() {
className="-ml-3 inline-block p-3"
>
<Image
src={'/halloweenLogo.png'}
src={'/logo.png'}
width={1544}
height={380}
priority
Expand Down
10 changes: 5 additions & 5 deletions src/components/layout/UserHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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={'/halloweenLogo.png'}
src={'/logo.png'}
width={1544}
height={380}
priority
Expand Down Expand Up @@ -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-halloween"
className="text-md flex items-center font-semibold text-gray-500 hover:text-blue-500"
>
{item.image && (
<Image
Expand Down Expand Up @@ -147,7 +147,7 @@ export default function UserHeader() {
>
<Link href="/" className="-ml-3 inline-block p-3">
<Image
src={'/halloweenLogo.png'}
src={'/logo.png'}
width={1544}
height={380}
priority
Expand All @@ -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-halloween focus:outline-none"
className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-blue-500 focus:outline-none"
>
{category}
</Link>
) : (
<div>
<button
onClick={() => handleDropdownToggle(category)}
className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-halloween focus:outline-none"
className="inline-block p-3 font-semibold text-gray-500 transition-colors hover:text-blue-500 focus:outline-none"
>
{category}
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/FilterOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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-halloween` : `text-gray-500`
item === active ? `border-b text-blue-500` : `text-gray-500`
} ${item === '카테고리' && 'md:hidden'}`}
>
<span>{item}</span>
Expand Down
3 changes: 0 additions & 3 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ module.exports = {
112: '28rem',
128: '32rem',
},
colors: {
halloween: '#F97316',
},
keyframes: {
'accordion-down': {
from: { height: '0' },
Expand Down

0 comments on commit 6e77748

Please sign in to comment.