TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

fixed release chat icons

Browse source
This commit is contained in:
WolverinDEV 2019-02-09 21:08:49 +01:00
parent aa692981d3
commit 4835e6e9e8
3 changed files with 95 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shared/css/static/general.scss
View file

@ -35,8 +35,12 @@
} }
@keyframes spin { @keyframes spin {
0% { transform: rotate(0deg); } 0% {
100% { transform: rotate(360deg); } transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
} }
.select_info { .select_info {
@ -133,8 +137,14 @@
/* Add Animation */ /* Add Animation */
@keyframes modalFlyIn { @keyframes modalFlyIn {
from {top: 0%; opacity: 0} from {
to {top: 10%; opacity: 1} top: 0%;
opacity: 0
}
to {
top: 10%;
opacity: 1
}
} }
.channel_perm_tbl input { .channel_perm_tbl input {
@ -191,6 +201,7 @@ fieldset {
border-width: 2px; border-width: 2px;
border-radius: 0px 6px 6px 6px; border-radius: 0px 6px 6px 6px;
} }
code { code {
background-color: lightgray; background-color: lightgray;
padding: 2px; padding: 2px;

10
shared/css/static/ts/chat.scss
View file

@ -1,5 +1,5 @@
#chat { #chat {
font-family: Arial; font-family: Arial, serif;
font-size: 12px; font-size: 12px;
/*white-space: pre;*/ /*white-space: pre;*/
line-height: 1; line-height: 1;
@ -44,7 +44,6 @@
max-width: 100%; max-width: 100%;
flex-shrink: 0; flex-shrink: 0;
flex-grow: 0; flex-grow: 0;
/*height: 24px;*/
overflow: auto; overflow: auto;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap; white-space: nowrap;
@ -56,11 +55,12 @@
background: #5f5f5f5f; background: #5f5f5f5f;
display: inline-block; display: inline-block;
border: 1px solid #6f6f6f; border: 1px solid #6f6f6f;
border-radius: 0px 0px 2px 2px; border-radius: 0 0 2px 2px;
vertical-align: middle; vertical-align: middle;
padding-right: 5px; padding-right: 5px;
padding-left: 2px; padding-left: 2px;
cursor: pointer; cursor: pointer;
height: 18px;
&.active { &.active {
background: #11111111; background: #11111111;
@ -77,6 +77,10 @@
cursor: pointer; cursor: pointer;
} }
} }
.name, .chatIcon {
display: inline-block;
}
} }
} }

4
shared/js/chat.ts
View file

@ -209,7 +209,7 @@ class ChatEntry {
let tag = $.spawn("div"); let tag = $.spawn("div");
tag.addClass("chat"); tag.addClass("chat");
tag.append("<div class=\"chatIcon icon clicon " + this.chatIcon() + "\"></div>"); tag.append("<div class=\"chatIcon icon " + this.chatIcon() + "\"></div>");
tag.append("<a class='name'>" + this._name + "</a>"); tag.append("<a class='name'>" + this._name + "</a>");
let closeTag = $.spawn("div"); let closeTag = $.spawn("div");
@ -288,7 +288,7 @@ class ChatEntry {
set unread(flag : boolean) { set unread(flag : boolean) {
if(this._unread == flag) return; if(this._unread == flag) return;
this._unread = flag; this._unread = flag;
this.htmlTag.find(".chatIcon").attr("class", "chatIcon icon clicon " + this.chatIcon()); this.htmlTag.find(".chatIcon").attr("class", "chatIcon icon " + this.chatIcon());
if(flag) { if(flag) {
this.htmlTag.find(".name").css("color", "blue"); this.htmlTag.find(".name").css("color", "blue");
} else { } else {