Skip to content

Commit

Permalink
Fix: fix conflicted style
Browse files Browse the repository at this point in the history
  • Loading branch information
JSH99 committed Jan 18, 2024
1 parent 11ff202 commit 43632ae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "@/sass" as *;
@use '@/sass' as *;

.titleHeader {
background-color: $neutral0;
Expand All @@ -8,11 +8,11 @@
top: 0;
z-index: 2;

nav {
.titleNavigation {
padding: 16px 20px;
}

h1 {
.selectTitle {
@include typography(headline);
padding: 8px 20px;
}
Expand Down
16 changes: 8 additions & 8 deletions src/components/TripSpace/SelectHeader/SelectHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { useNavigate } from "react-router-dom";
import {useNavigate} from 'react-router-dom';

import styles from "./SelectHeader.module.scss";
import styles from './SelectHeader.module.scss';

import BackIcon from "@/assets/back.svg?react";
import BackIcon from '@/assets/back.svg?react';

import { SelectHeaderProps } from "@/types/selectHeader";
import {SelectHeaderProps} from '@/types/selectHeader';

function SelectHeader({ title }: SelectHeaderProps) {
function SelectHeader({title}: SelectHeaderProps) {
const navigate = useNavigate();

return (
<header className={styles.titleHeader}>
<nav>
<div className={styles.titleNavigation}>
<button onClick={() => navigate(-1)}>
<BackIcon />
</button>
</nav>
<h1>{title}</h1>
</div>
<h1 className={styles.selectTitle}>{title}</h1>
</header>
);
}
Expand Down

0 comments on commit 43632ae

Please sign in to comment.