Skip to content

Commit

Permalink
Merge pull request #580 from woowacourse-teams/fix/#579
Browse files Browse the repository at this point in the history
svg형식이 url일 때, svg파일을 불러오지 못하는 문제가 발생
  • Loading branch information
cys4585 authored Sep 26, 2024
2 parents 2cb9615 + ed65ab1 commit c25c4b5
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { SerializedStyles, css } from '@emotion/react';

export const name = ({ font }: { font: string | SerializedStyles }) => css`
${font}
max-width: 40vw;
overflow-x: hidden;
max-width: 40vw;
text-overflow: ellipsis;
white-space: nowrap;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export const textArea = (props: { theme: Theme }) => css`
flex-shrink: 0;
box-sizing: border-box;
padding: 0.6rem;
width: 100%;
height: 24rem;
padding: 0.6rem;
font-size: 1.6rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { css } from '@emotion/react';

export const noneBaackgroundButton = css`
cursor: pointer;
background: none;
border: none;
cursor: pointer;
`;
2 changes: 1 addition & 1 deletion frontend/src/components/TextArea/LabeledTextArea.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export const textArea = (props: { theme: Theme }) => css`
flex-shrink: 0;
padding: 0.6rem;
height: 8rem;
padding: 0.6rem;
font-size: 1.6rem;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/hooks/useStatePersist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export default function useStatePersist<StateType>({

useEffect(() => {
removeStoredValue();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return [state, setState];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ export const headerStyle = css`
width: 100%;
max-width: ${DISPLAY_MAX_WIDTH};
background-color: white;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ export const messageForm = ({ theme }: { theme: Theme }) => css`

export const messageTextArea = ({ theme }: { theme: Theme }) => css`
${theme.typography.s2};
width: 100%;
resize: none;
width: 100%;
background: rgb(0 0 0 / 0%);
border: 0;
outline: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { css } from '@emotion/react';

export const ProfileContanier = css`
scrollbar-width: none; /* TODO Firefox 현재 no-unsupported-browser-features 경고 발생 중 추후 확인 필요 */
/* scrollbar-width: none; TODO Firefox 현재 no-unsupported-browser-features 경고 발생 중 추후 확인 필요 */
overflow: auto hidden;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ export const CardBox = (props: { theme: Theme }) => css`
display: flex;
gap: 1rem;
align-items: center;
width: 100%;
border-radius: 1rem;
&:active {
background-color: ${props.theme.colorPalette.grey[100]};
}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/service/notification.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable compat/compat */
import { getMessaging, getToken } from 'firebase/messaging';

import { app } from './initFirebase';
Expand Down
6 changes: 3 additions & 3 deletions frontend/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ module.exports = {
resourceQuery: { not: [/url/] },
generator: {
outputPath: 'svgs/',
publicPath: 'svgs/',
publicPath: '/svgs/',
},
},
{
type: 'asset/resource',
resourceQuery: /url/,
generator: {
outputPath: 'svgs/',
publicPath: 'svgs/',
publicPath: '/svgs/',
},
},
],
Expand All @@ -77,7 +77,7 @@ module.exports = {
type: 'asset/resource',
generator: {
outputPath: 'assets/',
publicPath: 'assets/',
publicPath: '/assets/',
},
},
],
Expand Down

0 comments on commit c25c4b5

Please sign in to comment.