Merge remote-tracking branch 'duckie-temp/main' into duckie-merge-2026-04-21

# Conflicts:
#	src/components/room/widgets/chat-input/ChatInputView.tsx
#	src/components/toolbar/ToolbarView.tsx
#	src/css/chat/Chats.css
#	src/css/nitrocard/NitroCardView.css
#	src/css/purse/PurseView.css
#	src/css/room/RoomWidgets.css
This commit is contained in:
Lorenzune
2026-04-21 11:19:59 +02:00
43 changed files with 1453 additions and 293 deletions
+7
View File
@@ -179,6 +179,13 @@
height: 45px;
}
.nitro-icon.icon-youtube {
background-image: url("@/assets/images/toolbar/icons/youtube.svg");
background-size: contain;
width: 36px;
height: 36px;
}
.nitro-icon.icon-message {
background-image: url("@/assets/images/toolbar/icons/message.png");
width: 36px;
+27
View File
@@ -3,6 +3,33 @@
@config "../../tailwind.config.js";
@theme {
--animate-pulse-glow: pulseGlow 1.2s ease-in-out infinite;
--animate-pulse-glow-red: pulseGlowRed 1.2s ease-in-out infinite;
--animate-drop-settle: dropSettle 0.3s ease-out;
--animate-pulse-glow-gold: pulseGlowGold 1.5s ease-in-out infinite;
}
@keyframes pulseGlow {
0%, 100% { box-shadow: 0 0 6px rgba(59, 130, 246, 0.3); }
50% { box-shadow: 0 0 14px rgba(59, 130, 246, 0.6); }
}
@keyframes pulseGlowRed {
0%, 100% { box-shadow: 0 0 6px rgba(239, 68, 68, 0.3); }
50% { box-shadow: 0 0 14px rgba(239, 68, 68, 0.6); }
}
@keyframes dropSettle {
0% { transform: scale(1.15); }
100% { transform: scale(1); }
}
@keyframes pulseGlowGold {
0%, 100% { box-shadow: 0 0 6px rgba(255, 193, 7, 0.4); }
50% { box-shadow: 0 0 14px rgba(255, 193, 7, 0.7); }
}
@font-face {
font-family: Ubuntu;
src: url("@/assets/webfonts/Ubuntu-C.ttf");
+1 -1
View File
@@ -139,7 +139,7 @@
div {
line-height: 28px;
text-align: center;
color: $black;
color: #000;
font-weight: bold;
}
}
-1
View File
@@ -308,7 +308,6 @@
&.stickie-yellow {
background-image: url('@/assets/images/room-widgets/stickie-widget/stickie-yellow.png');
//background-position: -191px -184px;
}
&.stickie-green {