From 61de8008e5eec795fa37bb7bfa60c3a1fc2d61a3 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 18 Jul 2020 00:18:02 +0200 Subject: [PATCH] Removed some unused junk --- loader/app/targets/app.ts | 1 - shared/css/generate_packed.sh | 1 - shared/css/static/frame-chat.scss | 859 --------------------- shared/css/static/main-layout.scss | 2 - shared/css/static/modal-volume.scss | 49 -- shared/js/ui/frames/chat_frame.ts | 1 - shared/js/ui/frames/connection_handlers.ts | 10 - 7 files changed, 923 deletions(-) delete mode 100644 shared/css/static/modal-volume.scss diff --git a/loader/app/targets/app.ts b/loader/app/targets/app.ts index c861aa11..14c4ca44 100644 --- a/loader/app/targets/app.ts +++ b/loader/app/targets/app.ts @@ -150,7 +150,6 @@ const loader_style = { "css/static/modal-connect.css", "css/static/modal-channel.css", "css/static/modal-query.css", - "css/static/modal-volume.css", "css/static/modal-latency.css", "css/static/modal-invite.css", "css/static/modal-banlist.css", diff --git a/shared/css/generate_packed.sh b/shared/css/generate_packed.sh index a671de2a..c31d58c3 100644 --- a/shared/css/generate_packed.sh +++ b/shared/css/generate_packed.sh @@ -43,7 +43,6 @@ files=( "css/static/modal-serverinfobandwidth.css" "css/static/modal-serverinfo.css" "css/static/modal-settings.css" - "css/static/modal-volume.css" "css/static/overlay-image-preview.css" "css/static/ts/tab.css" diff --git a/shared/css/static/frame-chat.scss b/shared/css/static/frame-chat.scss index 7c0bc66d..19f9c1d9 100644 --- a/shared/css/static/frame-chat.scss +++ b/shared/css/static/frame-chat.scss @@ -240,793 +240,6 @@ $bot_thumbnail_height: 9em; display: flex; flex-direction: column; - .container-private-conversations { - height: 100%; - - flex-grow: 1; - flex-shrink: 1; - - display: flex; - flex-direction: row; - justify-content: stretch; - - .conversation-list { - margin-right: -2px; /* the fix for the seperator with of 3px */ - user-select: none; - - overflow-x: hidden; - overflow-y: auto; - - @include chat-scrollbar-vertical(); - - width: 25%; - min-width: 100px; - - position: relative; - - .no-chats { - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - - > div { - display: inline-block; - color: #5a5a5a; - } - } - - .conversation-entry { - position: relative; - - display: flex; - flex-direction: row; - justify-content: stretch; - - cursor: pointer; - border-bottom: 1px solid #313132; - - .container-avatar { - flex-grow: 0; - flex-shrink: 0; - - position: relative; - - display: inline-block; - margin: 5px 10px 5px 5px; - - .avatar { - overflow: hidden; - - width: 2em; - height: 2em; - - border-radius: 50%; - } - - .chat-unread { - display: none; - - position: absolute; - top: 0; - right: 0; - background-color: #a81414; - width: 7px; - height: 7px; - - border-radius: 50%; - - -webkit-box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.20); - -moz-box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.20); - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.20); - } - } - - &.unread { - .chat-unread { - display: block; - } - } - - .info { - flex-grow: 1; - flex-shrink: 1; - min-width: 50px; - - display: flex; - flex-direction: column; - justify-content: center; - - > * { - flex-grow: 0; - flex-shrink: 0; - - display: inline-block; - width: 100%; - - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - - .client-name { - color: $color_client_normal; - font-weight: bold; - - margin-bottom: -.4em; - } - - .client-version { - max-width: 100%; - - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - } - - .last-message { - color: #555353; - - display: inline-block; - font-size: .66em; - } - } - - .button-close { - font-size: 2em; - - position: absolute; - right: 0; - top: 0; - bottom: 0; - - opacity: 0.3; - - width: .5em; - height: .5em; - - &:hover { - opacity: 1; - } - @include transition(opacity $button_hover_animation_time ease-in-out); - - &:before, &:after { - position: absolute; - left: .25em; - content: ' '; - height: .5em; - width: .05em; - background-color: #5a5a5a; - } - - &:before { - transform: rotate(45deg); - } - - &:after { - transform: rotate(-45deg); - } - } - - &:hover { - background-color: #393939; - } - - &.selected { - background-color: #2c2c2c; - } - @include transition(background-color $button_hover_animation_time ease-in-out); - } - } - - .conversation { - min-width: 250px; - width: 75%; - - display: flex; - flex-direction: column; - justify-content: stretch; - - .spacer { - min-height: 0; - flex-grow: 1; - flex-shrink: 1; - } - - .container-messages { - @include user-select(none); - - display: block; - &[data-simplebar] { - display: flex; - } - - position: relative; - - flex-grow: 0; - flex-shrink: 1; - - min-height: 100px; - - overflow-y: auto; - overflow-x: hidden; - - .message-entry { - display: flex; - flex-direction: row; - justify-content: stretch; - - .container-avatar { - flex-grow: 0; - flex-shrink: 0; - - position: relative; - - display: inline-block; - margin: .5em 1em .5em .5em; - - .avatar { - overflow: hidden; - - width: 2.5em; - height: 2.5em; - - border-radius: 50%; - } - } - - .container-message { - flex-grow: 1; - flex-shrink: 1; - - min-width: 2em; - - display: flex; - flex-direction: column; - justify-content: flex-start; - - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; - - .info { - display: block; - - white-space : nowrap; - overflow : hidden; - text-overflow: ellipsis; - - margin-top: .5em; - - .client-name, .client-name .htmltag-client { - display: inline; - - font-weight: bold; - color: $color_client_normal; - } - - .timestamp { - display: inline; - - font-size: 0.66em; - color: #5d5b5b; - } - } - - .message { - color: #b5b5b5; - line-height: 1.1em; - word-wrap: break-word; - } - } - } - - .spacer-entry { - text-align: center; - //padding: .5em 1em; - color: #565353; - - &.type-disconnect_self { - color: #565353; /* not really critical at all */ - } - - &.type-new { - color: darkred; /* TODO: Evaluate color */ - } - - &.type-disconnect { - color: red; /* TODO: Evaluate color */ - } - - &.type-reconnect { - color: green; /* TODO: Evaluate color */ - } - - &.type-closed { - color: yellow; /* TODO: Evaluate color */ - } - - &.type-date { - color: #565353; - background-color: #353535; - - z-index: 2; /* over the avatar */ - position: sticky; - top: 0; - } - } - - @include chat-scrollbar(); - } - - .chatbox { - flex-grow: 0; - flex-shrink: 0; - - display: flex; - justify-content: stretch; - flex-direction: column; - - min-height: 2em; - - .container-typing { - font-size: .85em; - padding-left: .6em; - line-height: 1; - color: hsla(0, 0%, 30%, 1); - - opacity: 1; - - &.hidden { - opacity: 0; - } - - @include transition($button_hover_animation_time ease-in-out); - } - } - } - - .container-seperator { - z-index: 100; - height: unset!important; - width: 3px; - background-color: transparent; - border-right: 1px solid #292a2c; - } - } - - .container-chatbox { - @include user-select(none); - - flex-grow: 1; - flex-shrink: 0; - min-height: calc(1.5em + 10px); - height: auto; /* fallback */ - height: min-content; - - display: flex; - flex-direction: row; - justify-content: stretch; - - width: 100%; - padding: 5px; - - .container-emojis { - display: flex; - flex-direction: column; - justify-content: flex-end; - - margin-right: 5px; - - .button-emoji { - border-radius: 5px; - padding: 2px; - - cursor: pointer; - - display: flex; - flex-direction: row; - justify-content: space-around; - - &:hover { - background-color: #393939; - } - @include transition(background-color $button_hover_animation_time ease-in-out); - - .container-icon { - position: absolute; - display: flex; - - width: calc(1.5em - 4px); - height: calc(1.5em - 4px); - - > img { - height: 100%; - width: 100%; - } - } - - .lsx-emojipicker-appender { - position: relative; - - width: calc(1.5em - 4px); - height: calc(1.5em - 4px); - - .lsx-emojipicker-container { - &:after { - right: calc(0.75em + 2px) !important - } - - .lsx-emojipicker-tabs { - height: 38px; - - display: flex; - flex-direction: row; - justify-content: flex-start; - - li { - height: 36px; - width: 36px; - - display: flex; - flex-direction: column; - justify-content: space-around; - - img { - margin: 0; - } - } - } - } - } - } - } - - .container-input { - display: flex; - flex-direction: column; - justify-content: stretch; - min-height: 1.5em; - - width: 100%; - background-color: #464646; - border: 2px none #353535; /* background color (like no border) */ - - padding: 0 5px; - - overflow: hidden; - border-radius: 5px; - - .textarea { - @include user-select(text); - - width: 100%; - resize: none; - - min-height: 1.5em; - max-height: 6em; - height: 1.5em; - - overflow: auto; - - background-color: transparent; - padding: 0; - margin: 0; - border: none; - outline: none; - - color: #a9a9a9; - - @include chat-scrollbar-vertical(); - - } - - @include placeholder(textarea) { - color: #363535; - font-style: oblique; - } - - &:hover { - margin: -2px; - border: 2px solid #474747; - } - - &:focus-within { - margin: -2px; - border: 2px solid #585858; - } - - @include transition(border-color $button_hover_animation_time ease-in-out); - } - } - - .container-channel-chat { - width: 100%; - - flex-grow: 1; - flex-shrink: 1; - - display: flex; - flex-direction: column; - justify-content: stretch; - - /* 1.5em + 10px := chatbox; 2em chat */ - min-height: calc(1.5em + 10px + 2em); - - > .spacer { - min-height: 0; - flex-grow: 1; - flex-shrink: 1; - } - - > .container-chat { - @include user-select(none); - - padding: 5px; - - display: flex; - flex-direction: column; - justify-content: stretch; - - position: relative; - overflow: hidden; - - flex-grow: 1; - flex-shrink: 1; - - width: 100%; - min-height: 2em; - - .container-channel-chat-messages { - flex-grow: 1; - flex-shrink: 1; - - display: flex; - flex-direction: column; - justify-content: stretch; - - min-height: 2em; - } - - .container-messages { - flex-grow: 1; - flex-shrink: 1; - - display: block; - &[data-simplebar] { - display: flex; - } - - position: relative; - - overflow-y: auto; - overflow-x: hidden; - @include chat-scrollbar(); - - min-height: 2em; - - .message-entry { - flex-shrink: 0; - flex-grow: 0; - - display: flex; - flex-direction: row; - justify-content: stretch; - - .container-avatar { - flex-grow: 0; - flex-shrink: 0; - - position: relative; - - display: inline-block; - margin: 1em 1em .5em .5em; - - .avatar { - overflow: hidden; - - width: 2.5em; - height: 2.5em; - - border-radius: 50%; - } - } - - .container-message { - flex-grow: 0; - flex-shrink: 1; - - min-width: 2em; - - position: relative; - - display: inline-flex; - flex-direction: column; - justify-content: flex-start; - - @include user-select(text); - - background: #303030; - border-radius: 6px 6px 6px 6px; - - margin-top: .5em; - padding: .5em; - - .info { - display: block; - - white-space : nowrap; - overflow : hidden; - text-overflow: ellipsis; - - .client-name, .client-name .htmltag-client { - display: inline; - - font-weight: bold; - color: $color_client_normal; - } - - .timestamp { - display: inline; - - font-size: 0.66em; - color: #5d5b5b; - } - - .button-delete { - width: 1.1em; - cursor: pointer; - - display: inline-block; - align-self: auto; - - opacity: .25; - - > img { - vertical-align: text-top; - } - - &:hover { - opacity: 1; - } - - @include transform(opacity $button_hover_animation_time ease-in-out); - } - } - - .message { - color: #b5b5b5; - line-height: 1.1em; - - word-wrap: break-word; - - .htmltag-client, .htmltag-channel { - display: inline; - - font-weight: bold; - color: $color_client_normal; - } - } - - &:before { - position: absolute; - - content: ' '; - - width: 1em; - height: 1em; - - margin-left: calc(-.5em - 1em); - border-top: .5em solid transparent; - border-right: .75em solid #303030; - border-bottom: .5em solid transparent; - - top: 1.25em; - } - } - } - - .spacer-entry { - text-align: center; - //padding: .5em 1em; - color: #565353; - - &.type-new { - color: darkred; /* TODO: Evaluate color */ - } - - &.type-old { - opacity: 0; - cursor: pointer; - pointer-events: none; - - height: 0; - @include transition(opacity .25s ease-in-out); - &.shown { - height: unset; - - cursor: pointer; - pointer-events: all; - - opacity: 1; - @include transition(opacity .25s ease-in-out); - } - } - } - - } - - .new-message { - flex-grow: 0; - flex-shrink: 0; - - position: absolute; - bottom: 0; - right: 0; - left: 0; - - display: block; - text-align: center; - - width: 100%; - color: #8b8b8b; - - background: #353535; /* if we dont support gradients */ - background: linear-gradient(rgba(53, 53, 53, 0) 10%, #353535 70%); - pointer-events: none; - - opacity: 0; - @include transition(opacity .25s ease-in-out); - &.shown { - cursor: pointer; - pointer-events: all; - - opacity: 1; - @include transition(opacity .25s ease-in-out); - } - } - - .no-permissions, .private-conversation, .not-supported { - flex-grow: 0; - flex-shrink: 0; - - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - - text-align: center; - - width: 100%; - color: #5a5a5a; - background: #353535; - - - display: flex; - flex-direction: column; - justify-content: center; - - > div { - display: inline-block; - } - } - } - - > .container-chatbox { - flex-grow: 0; - flex-shrink: 0; - - min-height: 2em; - } - } - .container-client-info { position: relative; @@ -1386,78 +599,6 @@ $bot_thumbnail_height: 9em; } } - .container-private-conversations, .container-channel-chat { - .container-message .emoji { - height: 1.1em; - width: 1.1em; - - margin-left: .1em; - margin-right: .1em; - - vertical-align: text-bottom; - } - } - - .container-format-helper { - flex-shrink: 0; - flex-grow: 0; - - min-height: unset; - height: initial; - - color: #555555; - font-size: .8em; - text-align: right; - margin: -3px 2px 2px 2.5em; - - @include text-dotdotdot(); - @include transition($button_hover_animation_time ease-in-out); - - max-height: 2em; /* for a smooth transition */ - &.hidden { - max-height: 0; - } - } - - /* special xbbcode formats */ - .container-message .message { - hr { - border: none; - border-top: .125em solid #555; - - margin-top: .1em; - margin-bottom: .1em; - } - - table { - th, td { - border-color: #1e2025; - } - - tr { - background-color: #303036; - } - - tr:nth-child(2n) { - background-color: #25252a; - } - } - - .xbbcode-tag-img { - padding: .25em; - border-radius: .25em; - - overflow: hidden; - max-width: 20em; - max-height: 20em; - - img { - width: 100%; - height: 100%; - } - } - } - .container-music-info { position: relative; diff --git a/shared/css/static/main-layout.scss b/shared/css/static/main-layout.scss index 78cc39b6..eda56152 100644 --- a/shared/css/static/main-layout.scss +++ b/shared/css/static/main-layout.scss @@ -83,8 +83,6 @@ html:root { } > .channel-tree { - padding-top: 5px; - min-height: 5em; flex-grow: 1; diff --git a/shared/css/static/modal-volume.scss b/shared/css/static/modal-volume.scss deleted file mode 100644 index e45a75f6..00000000 --- a/shared/css/static/modal-volume.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import "mixin"; - -.modal-body.modal-volume { - @include user-select(none); - - .info { - display: flex; - flex-direction: row; - justify-content: stretch; - - .htmltag-client { - color: var(--text)!important; - margin-left: .25em; - } - - div { - display: flex; - flex-direction: row; - justify-content: stretch; - } - - .value { - margin-left: .25em; - } - } - - .container-slider { - margin-top: 1em; - } - - .buttons { - display: flex; - flex-direction: row; - justify-content: stretch; - - margin-top: 2em; - - .spacer { - flex-grow: 1; - flex-shrink: 1; - - min-width: 0; - } - - button:not(:last-of-type) { - margin-right: 1em; - } - } -} \ No newline at end of file diff --git a/shared/js/ui/frames/chat_frame.ts b/shared/js/ui/frames/chat_frame.ts index c435e453..2cc04070 100644 --- a/shared/js/ui/frames/chat_frame.ts +++ b/shared/js/ui/frames/chat_frame.ts @@ -5,7 +5,6 @@ import {ChannelEntry} from "tc-shared/ui/channel"; import {ServerEntry} from "tc-shared/ui/server"; import {openMusicManage} from "tc-shared/ui/modal/ModalMusicManage"; import {formatMessage} from "tc-shared/ui/frames/chat"; -import {PrivateConverations} from "tc-shared/ui/frames/side/private_conversations_old"; import {ClientInfo} from "tc-shared/ui/frames/side/client_info"; import {MusicInfo} from "tc-shared/ui/frames/side/music_info"; import {ConversationManager} from "tc-shared/ui/frames/side/ConversationManager"; diff --git a/shared/js/ui/frames/connection_handlers.ts b/shared/js/ui/frames/connection_handlers.ts index 26d6dfd0..9d6525c0 100644 --- a/shared/js/ui/frames/connection_handlers.ts +++ b/shared/js/ui/frames/connection_handlers.ts @@ -24,16 +24,6 @@ export class ConnectionManager { private _tag_button_scoll_right: JQuery; private _tag_button_scoll_left: JQuery; - private default_server_state: { - microphone_disabled: boolean, - speaker_disabled: boolean, - away: string | boolean - } = { - away: false, - speaker_disabled: false, - microphone_disabled: false - }; - constructor(tag: JQuery) { this.event_registry = new Registry(); this.event_registry.enable_debug("connection-manager");