diff --git a/Coolui v3 test/.vscode/settings.json b/Coolui v3 test/.vscode/settings.json new file mode 100644 index 0000000000..ff55f0cdd3 --- /dev/null +++ b/Coolui v3 test/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "css.validate": false, + "scss.validate": false, + "stylelint.enable": true +} \ No newline at end of file diff --git a/Coolui v3 test/src/common/layout/LayoutTrophyView.tsx b/Coolui v3 test/src/common/layout/LayoutTrophyView.tsx index dd2c284f56..2a0a68c74f 100644 --- a/Coolui v3 test/src/common/layout/LayoutTrophyView.tsx +++ b/Coolui v3 test/src/common/layout/LayoutTrophyView.tsx @@ -1,4 +1,4 @@ -import { FC } from 'react'; +import { FC, ReactNode } from 'react'; import { LocalizeText } from '../../api'; import { Base } from '../Base'; import { Column } from '../Column'; @@ -14,11 +14,12 @@ interface LayoutTrophyViewProps senderName: string; customTitle?: string; onCloseClick: () => void; + children?: React.ReactNode; } export const LayoutTrophyView: FC = props => { - const { color = '', message = '', date = '', senderName = '', customTitle = null, onCloseClick = null } = props; + const { color = '', message = '', date = '', senderName = '', customTitle = null, onCloseClick = null, children = null } = props; return ( @@ -28,6 +29,7 @@ export const LayoutTrophyView: FC = props => { LocalizeText('widget.furni.trophy.title') } + { children } { customTitle && { customTitle } } { message } diff --git a/Coolui v3 test/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx b/Coolui v3 test/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx index 57a67d3425..7663e07e5c 100644 --- a/Coolui v3 test/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx +++ b/Coolui v3 test/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { LayoutTrophyView } from '../../../../common'; +import { LayoutBadgeImageView, LayoutTrophyView } from '../../../../common'; import { useFurnitureBadgeDisplayWidget } from '../../../../hooks'; export const FurnitureBadgeDisplayView: FC<{}> = props => @@ -8,5 +8,11 @@ export const FurnitureBadgeDisplayView: FC<{}> = props => if(objectId === -1) return null; - return ; + return ( + +
+ +
+
+ ); }; diff --git a/Coolui v3 test/src/css/layout/LayoutTrophy.css b/Coolui v3 test/src/css/layout/LayoutTrophy.css index 0fe97ae2cd..8d97550f77 100644 --- a/Coolui v3 test/src/css/layout/LayoutTrophy.css +++ b/Coolui v3 test/src/css/layout/LayoutTrophy.css @@ -4,6 +4,7 @@ height: 173px; color: black; pointer-events: all; + z-index: 100; background-position: 0px 0px; background-image: url('@/assets/images/room-widgets/trophy-widget/trophy-spritesheet.png'); @@ -32,6 +33,11 @@ height: 116px; white-space: pre-wrap; overflow: auto; + + .layout-badge-image-view { + z-index: 101; + position: relative; + } } .trophy-footer {