diff --git a/public/configuration.json b/public/configuration.json index 965bc29c..30aa77ae 100644 --- a/public/configuration.json +++ b/public/configuration.json @@ -87,16 +87,24 @@ "roomId": 2346 } ], - "hotelview.images": { - "background": "${asset.url}/images/reception/stretch_blue.png", - "background.colour": "#6eadc8", - "sun": "${asset.url}/images/reception/sun.png", - "drape": "${asset.url}/images/reception/drape.png", - "left": "${asset.url}/images/reception/ts.png", - "right": "${asset.url}/images/reception/US_right.png", - "right.repeat": "${asset.url}/images/reception/US_top_right.png" + "hotelview": { + "widgets": { + "types": "news,", + "slot1": "news" + }, + "images": { + "background": "${asset.url}/images/reception/stretch_blue.png", + "background.colour": "#6eadc8", + "sun": "${asset.url}/images/reception/sun.png", + "drape": "${asset.url}/images/reception/drape.png", + "left": "${asset.url}/images/reception/ts.png", + "right": "${asset.url}/images/reception/US_right.png", + "right.repeat": "${asset.url}/images/reception/US_top_right.png" + } }, - "achievements.unseen.ignored": ["ACH_AllTimeHotelPresence"], + "achievements.unseen.ignored": [ + "ACH_AllTimeHotelPresence" + ], "avatareditor.show.clubitems.dimmed": true, "avatareditor.show.clubitems.first": true, "chat.history.max.items": 100, diff --git a/src/views/hotel-view/HotelView.scss b/src/views/hotel-view/HotelView.scss index 0825460a..97076eaf 100644 --- a/src/views/hotel-view/HotelView.scss +++ b/src/views/hotel-view/HotelView.scss @@ -2,7 +2,7 @@ display: block; position: fixed; width: 100%; - height: 100%; + height: calc(100% - 55px); background: rgba($black, 1); .avatar-image { @@ -39,6 +39,7 @@ right: 0; margin: auto; background-repeat: no-repeat; + background-position: top center; } .left { @@ -61,6 +62,7 @@ animation-name: slideUp; animation-duration: 1s; background-repeat: no-repeat; + background-position: right bottom; } .right-repeat { @@ -68,9 +70,7 @@ height: 100%; right: 0; top: 0; - animation-iteration-count: 1; - animation-name: slideRight; - animation-duration: 1s; background-repeat: no-repeat; + background-position: right top; } } diff --git a/src/views/hotel-view/HotelView.tsx b/src/views/hotel-view/HotelView.tsx index 12fe403f..9222f3b8 100644 --- a/src/views/hotel-view/HotelView.tsx +++ b/src/views/hotel-view/HotelView.tsx @@ -26,13 +26,13 @@ export const HotelView: FC = props => if(!isVisible) return null; - const backgroundColor = GetConfiguration('hotelview.images')['background.colour']; - const background = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['background']); - const sun = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['sun']); - const drape = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['drape']); - const left = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['left']); - //const rightRepeat = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['right.repeat']); - //const right = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview.images')['right']); + const backgroundColor = GetConfiguration('hotelview')['images']['background.colour']; + const background = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['background']); + const sun = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['sun']); + const drape = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['drape']); + const left = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['left']); + const rightRepeat = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['right.repeat']); + const right = Nitro.instance.core.configuration.interpolate(GetConfiguration('hotelview')['images']['right']); return (
@@ -40,8 +40,8 @@ export const HotelView: FC = props =>
- {/*
-
*/} +
+
); }