Merge branch 'Dev' into feat/wired-fixes-apr08

This commit is contained in:
DuckieTM
2026-04-13 16:58:14 +02:00
committed by GitHub
48 changed files with 1692 additions and 881 deletions
-303
View File
@@ -9,7 +9,6 @@
&.type-0 {
// normal
.message {
font-weight: 400;
}
@@ -17,7 +16,6 @@
&.type-1 {
// whisper
.message {
font-weight: 400;
font-style: italic;
@@ -27,7 +25,6 @@
&.type-2 {
// shout
.message {
font-weight: 700;
}
@@ -1510,304 +1507,4 @@
&.bubble-53 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_53.png');
}
&.bubble-200 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_200.png');
&::before {
content: '!';
position: absolute;
left: 12px;
top: 10px;
width: 14px;
height: 14px;
border-radius: 50%;
background: #fff;
color: #a82424;
display: flex;
align-items: center;
justify-content: center;
font-size: 11px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-201 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_201.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url('@/assets/images/chat/chatbubbles/bubble_34_extra.png');
}
}
&.bubble-202 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_202.png');
&::before {
content: '!';
position: absolute;
left: 12px;
top: 10px;
width: 14px;
height: 14px;
border-radius: 50%;
background: #fff;
color: #1b5ac2;
display: flex;
align-items: center;
justify-content: center;
font-size: 11px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-210 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_200.png');
&::before {
content: '!';
position: absolute;
left: 12px;
top: 10px;
width: 14px;
height: 14px;
border-radius: 50%;
background: #fff;
color: #a82424;
display: flex;
align-items: center;
justify-content: center;
font-size: 11px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-211 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_202.png');
&::before {
content: 'i';
position: absolute;
left: 12px;
top: 10px;
width: 14px;
height: 14px;
border-radius: 50%;
background: #fff;
color: #1b5ac2;
display: flex;
align-items: center;
justify-content: center;
font-size: 10px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-212 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_212.png');
&::before {
content: '';
position: absolute;
left: 9px;
top: 7px;
width: 20px;
height: 18px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='18' viewBox='0 0 20 18'%3E%3Cpath d='M10 2L18 16H2Z' fill='none' stroke='white' stroke-width='2' stroke-linejoin='round'/%3E%3Cpath d='M10 5.6V10.8' stroke='white' stroke-width='2' stroke-linecap='round'/%3E%3Ccircle cx='10' cy='13.4' r='1.2' fill='white'/%3E%3C/svg%3E");
}
}
&.bubble-220 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_220.png');
&::before {
content: "\2715";
position: absolute;
left: 12px;
top: 9px;
color: #fff;
font-size: 15px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-221 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_220.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='7' fill='white'/%3E%3Cpath d='M5.3 5.3L10.7 10.7M10.7 5.3L5.3 10.7' stroke='%23af3131' stroke-width='2' stroke-linecap='round'/%3E%3C/svg%3E");
}
}
&.bubble-222 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_222.png');
&::before {
content: "\2713";
position: absolute;
left: 12px;
top: 8px;
color: #fff;
font-size: 15px;
font-weight: 700;
line-height: 1;
}
}
&.bubble-223 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_222.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='7' fill='white'/%3E%3Cpath d='M4.6 8.2L7 10.6L11.6 6' stroke='%23009c6c' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' fill='none'/%3E%3C/svg%3E");
}
}
&.bubble-224 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_224.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 6px;
width: 20px;
height: 20px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Ctext x='10' y='10.5' text-anchor='middle' dominant-baseline='middle' font-size='15.5' font-weight='900' font-family='Arial, sans-serif' fill='white' stroke='white' stroke-width='0.55' paint-order='stroke fill'%3E%3F%3C/text%3E%3C/svg%3E");
}
}
&.bubble-225 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_224.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='7' fill='white'/%3E%3Ctext x='8' y='8.3' text-anchor='middle' dominant-baseline='middle' font-size='11.2' font-weight='900' font-family='Arial, sans-serif' fill='%23ab47ff' stroke='%23ab47ff' stroke-width='0.4' paint-order='stroke fill'%3E%3F%3C/text%3E%3C/svg%3E");
}
}
&.bubble-226 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_226.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='M8 4.3V10.8' stroke='white' stroke-width='2' stroke-linecap='round'/%3E%3Cpath d='M5.8 6.6L8 4.4L10.2 6.6' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' fill='none'/%3E%3C/svg%3E");
}
}
&.bubble-227 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_226.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='7' fill='white'/%3E%3Cpath d='M8 4.3V10.8' stroke='%23009c6c' stroke-width='2' stroke-linecap='round'/%3E%3Cpath d='M5.8 6.6L8 4.4L10.2 6.6' stroke='%23009c6c' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' fill='none'/%3E%3C/svg%3E");
}
}
&.bubble-228 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_228.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpath d='M8 5.2V11.7' stroke='white' stroke-width='2' stroke-linecap='round'/%3E%3Cpath d='M5.8 9.5L8 11.7L10.2 9.5' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' fill='none'/%3E%3C/svg%3E");
}
}
&.bubble-229 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_228.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='7' fill='white'/%3E%3Cpath d='M8 5.2V11.7' stroke='%23af3131' stroke-width='2' stroke-linecap='round'/%3E%3Cpath d='M5.8 9.5L8 11.7L10.2 9.5' stroke='%23af3131' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' fill='none'/%3E%3C/svg%3E");
}
}
&.bubble-250 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_250.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url('@/assets/images/chat/chatbubbles/bubble_skull_extra.png');
}
}
&.bubble-251 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_251.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url('@/assets/images/chat/chatbubbles/bubble_skull_extra.png');
}
}
&.bubble-252 {
background-image: url('@/assets/images/chat/chatbubbles/bubble_252.png');
&::before {
content: '';
position: absolute;
left: 10px;
top: 8px;
width: 16px;
height: 16px;
background: center / contain no-repeat url('@/assets/images/chat/chatbubbles/bubble_252_extra.png');
}
}
}
+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
@@ -2,6 +2,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");
+144 -59
View File
@@ -1,25 +1,70 @@
.nitro-card {
resize: both;
border: 2px solid #000 !important;
border-radius: 10px;
background: #f2f2eb;
box-shadow: 0 8px 22px rgba(0, 0, 0, 0.28);
.nitro-card-header {
position: relative;
min-height: 36px;
max-height: 36px;
width: 100%;
margin: 0;
padding: 5px;
background: #30728c;
border: 2px solid #3c88a6;
border-bottom-color: #000;
border-radius: 8px 8px 0 0;
box-shadow: none;
@media (max-width: 991.98px) {
max-width: 100vw !important;
max-height: 100vh !important;
}
&:before {
display: none;
&.theme-primary {
border: 1px solid #283F5D;
.nitro-card-header {
min-height: 33px;
max-height: 33px;
background: #1E7295;
.nitro-card-header-text {
color: #FFF;
text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
font-size: 1.35rem;
}
.nitro-card-header-close {
cursor: pointer;
padding: 2px 2px;
line-height: 1;
border-radius: .25rem;
box-shadow: 0 0 0 1.6px #FFF;
border: 2px solid #921911;
background: repeating-linear-gradient(
rgba(245, 80, 65, 1),
rgba(245, 80, 65, 1) 50%,
rgba(194, 48, 39, 1) 50%,
rgba(194, 48, 39, 1) 100%
);
&:hover {
filter: brightness(1.2);
}
&:active {
filter: brightness(0.8);
}
}
.nitro-card-header-report-camera {
cursor: pointer;
padding: 1px 3px;
line-height: 1;
border-radius: .25rem;
box-shadow: 0 0 0 1.6px #FFF;
border: 2px solid #921911;
background: repeating-linear-gradient(
rgba(245, 80, 65, 1),
rgba(245, 80, 65, 1) 50%,
rgba(194, 48, 39, 1) 50%,
rgba(194, 48, 39, 1) 100%
);
&:hover {
filter: brightness(1.2);
}
&:active {
filter: brightness(0.8);
}
}
}
.nitro-card-header-text {
@@ -54,34 +99,84 @@
}
}
.nitro-card-tabs {
display: flex;
flex-wrap: wrap;
gap: 4px;
min-height: auto;
max-height: none;
padding: 4px 8px 0;
background: #d9ded7;
border-bottom: 2px solid #c4cabf;
&.theme-primary-slim {
border: 1px solid #283F5D;
.nav-item {
padding: 0.35rem 0.8rem;
margin-bottom: -1px;
color: #000;
background: #d2d7cf;
border: 2px solid #000;
border-bottom: 0;
border-radius: 8px 8px 0 0;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.7);
.nitro-card-header {
position: relative;
min-height: 28px;
max-height: 28px;
background: repeating-linear-gradient(#2DABC2, #2DABC2 50%, #2B91A7 50%, #2B91A7 100%);
border-bottom: 2px solid #267F93;
box-shadow: 0 2px white;
width: 100%;
margin: 0;
padding-top:2px;
&:before {
display: none;
position: absolute;
content: ' ';
top: 0;
left: 0;
width: 100%;
height: 2px;
background-color: rgba(255, 255, 255, 0.3);
}
&.active {
background: #f2f2eb;
border-color: #000 !important;
border-bottom: 0;
.nitro-card-header-text {
color: #FFF;
text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
font-size: 1.125rem;
min-height: 21px;
}
.nitro-card-header-close {
cursor: pointer;
padding: 0px 2px;
line-height: 1;
font-size: 0.675rem;
border-radius: .25rem;
box-shadow: 0 0 0 1.6px #FFF;
border: 2px solid #921911;
background: repeating-linear-gradient(
rgba(245, 80, 65, 1),
rgba(245, 80, 65, 1) 50%,
rgba(194, 48, 39, 1) 50%,
rgba(194, 48, 39, 1) 100%
);
&:hover {
filter: brightness(1.2);
}
&:active {
filter: brightness(0.8);
}
}
.nitro-card-header-report-camera {
cursor: pointer;
padding: 0px 2px;
margin-right: 4px;
line-height: 1;
font-size: 0.675rem;
border-radius: .25rem;
box-shadow: 0 0 0 1.6px #FFF;
border: 2px solid #921911;
background: repeating-linear-gradient(
rgba(245, 80, 65, 1),
rgba(245, 80, 65, 1) 50%,
rgba(194, 48, 39, 1) 50%,
rgba(194, 48, 39, 1) 100%
);
&:hover {
filter: brightness(1.2);
}
&:active {
filter: brightness(0.8);
}
}
}
}
@@ -126,21 +221,11 @@
color: #111;
}
p,
label,
li,
td,
th,
input,
textarea,
select,
button {
font-size: 12px;
line-height: 1.25;
}
&.theme-dark {
background-color: #1c323f !important;
@media (max-width: 991.98px) {
.content-area {
height: 100% !important;
min-height: auto !important;
max-height: 100% !important;
}
}
@@ -153,12 +238,12 @@
&.active {
height: 100%;
overflow: hidden;
background: rgba(#fff, 0.5);
border-bottom: 1px solid rgba(#000, 0.2);
background: rgba(255, 255, 255, 0.5);
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
}
.nitro-card-accordion-set-header {
border-bottom: 1px solid rgba(#000, 0.2);
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
}
}
+40 -1
View File
@@ -349,7 +349,46 @@
}
.nitro-purse {
border-radius: 9px;
margin-top: 4px;
.nitro-purse-subscription {
background-color: rgba(248, 249, 250, 0.1);
}
.nitro-purse-button {
padding: 3px 2px;
}
.coffecurrencybutton{
border-radius: 0.5rem !important;
background-color: #b69b83;
border: 2px solid hsla(0deg, 0%, 100%, 0.5);
margin-bottom: 3px;
padding: 0px !important;
width: 30px;
pointer-events: all;
}
.borderhccontent{
background-color: #212131;
border-radius: 0.5rem!important;
border: 2px solid #383853;
height: calc(100% - 3px);
}
.nitro-purse-button.currency--1 {
background: #e8b125;
border: 2px solid #f4d892;
}
.nitro-purse-button.currency-0 {
background: #c364c1;
border: 2px solid #ecb3ea;
}
.nitro-purse-button.currency-5 {
background: #6bafaa;
border: 2px solid #ace6e2;
}
.allcurrencypurse{
border-radius: 5px!important;
margin-bottom: 2px;
}
}
.nitro-purse__content {
+1 -1
View File
@@ -139,7 +139,7 @@
div {
line-height: 28px;
text-align: center;
color: $black;
color: #000;
font-weight: bold;
}
}
+12 -17
View File
@@ -46,13 +46,10 @@
}
.nitro-room-tools {
background: rgba(10, 10, 12, 0.58);
border: 1px solid rgba(255, 255, 255, 0.08);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-top-right-radius: 12px;
border-bottom-right-radius: 12px;
box-shadow: 0 10px 24px rgba(0, 0, 0, 0.2);
background: #212131;
box-shadow: inset 0px 5px rgba(6, 6, 6, 0.6), inset 0 -4px rgba(0, 0, 0, 0.6);
border-top-right-radius: .25rem;
border-bottom-right-radius: .25rem;
transition: all .2s ease;
z-index: 71;
margin-left: 0;
@@ -65,7 +62,7 @@
background: transparent;
padding: 3px 0px;
color: #FFF;
border-color: rgba(#000, 0.3);
border-color: rgba(0, 0, 0, 0.3);
cursor: pointer;
&:hover {
@@ -103,9 +100,8 @@
}
.nitro-room-history {
background: rgba(10, 10, 12, 0.58);
border: 1px solid rgba(255, 255, 255, 0.08);
box-shadow: 0 10px 24px rgba(0, 0, 0, 0.2);
background: #212131;
box-shadow: inset 0px 5px rgba(6, 6, 6, 0.6), inset 0 -4px rgba(0, 0, 0, 0.6);
transition: all .2s ease;
width: 150px;
overflow: hidden;
@@ -114,9 +110,8 @@
}
.nitro-room-tools-info {
background: rgba(10, 10, 12, 0.58);
border: 1px solid rgba(255, 255, 255, 0.08);
box-shadow: 0 10px 24px rgba(0, 0, 0, 0.2);
background: #212131;
box-shadow: inset 0px 5px rgba(6, 6, 6, 0.6), inset 0 -4px rgba(0, 0, 0, 0.6);
transition: all .2s ease;
max-width: 250px;
border-radius: 14px;
@@ -137,9 +132,9 @@
left: 50%;
transform: translateX(-50%);
font-size: large;
background: rgba(#000, 0.95);
box-shadow: inset 0px 5px lighten(rgba(#000, .6), 2.5), inset 0 -4px darken(rgba(#000, .6), 4);
border-radius: $border-radius;
background: rgba(0, 0, 0, 0.95);
box-shadow: inset 0px 5px rgba(6, 6, 6, 0.6), inset 0 -4px rgba(0, 0, 0, 0.6);
border-radius: 0.25rem;
transition: all 0.2s ease;
z-index: 21;
-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 {