From 0b17e0e1a1fae5bea6d2bfbadc3728c65786a6f1 Mon Sep 17 00:00:00 2001 From: kckckc Date: Sat, 16 Apr 2022 23:27:59 -0700 Subject: [PATCH 1/2] Separate chat and chat filters border shadow --- src/client/ui/templates/messages/styles.less | 9 ++++++- .../ui/templates/messages/template.html | 24 ++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less index e3062111..435b0672 100644 --- a/src/client/ui/templates/messages/styles.less +++ b/src/client/ui/templates/messages/styles.less @@ -222,12 +222,19 @@ } &.typing { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; pointer-events: all; .filters { pointer-events: all; display: flex; + + .filter { + box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; + } + } + + .main { + box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; } .list { diff --git a/src/client/ui/templates/messages/template.html b/src/client/ui/templates/messages/template.html index 566ee2f3..5be45136 100644 --- a/src/client/ui/templates/messages/template.html +++ b/src/client/ui/templates/messages/template.html @@ -5,16 +5,18 @@
players
loot
-
-
-
- -
-
-
-
-
global
-
party
-
direct
+
+
+
+
+ +
+
+
+
+
global
+
party
+
direct
+
From 250a35a29432ff9d862d4888ef6ce6c6f8fb2562 Mon Sep 17 00:00:00 2001 From: kckckc Date: Wed, 20 Apr 2022 00:51:54 -0700 Subject: [PATCH 2/2] Use hasBorderShadow class --- src/client/ui/templates/messages/messages.js | 2 ++ src/client/ui/templates/messages/styles.less | 8 -------- src/client/ui/templates/messages/template.html | 8 ++++---- src/client/ui/templates/messages/tplTab.html | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js index 4b88ac2c..bf43ecf8 100644 --- a/src/client/ui/templates/messages/messages.js +++ b/src/client/ui/templates/messages/messages.js @@ -296,11 +296,13 @@ define([ input.resetKeys(); this.el.removeClass('typing'); + this.el.find('.main').removeClass('hasBorderShadow'); let textbox = this.find('input'); if (show) { this.el.addClass('typing'); + this.el.find('.main').addClass('hasBorderShadow'); if (!config.rememberChatChannel) { this.currentChannel = 'global'; diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less index 435b0672..6334ab13 100644 --- a/src/client/ui/templates/messages/styles.less +++ b/src/client/ui/templates/messages/styles.less @@ -227,14 +227,6 @@ .filters { pointer-events: all; display: flex; - - .filter { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; - } - } - - .main { - box-shadow: 0 -2px 0 @black, 0 2px 0 @black, 2px 0 0 @black, -2px 0 0 @black; } .list { diff --git a/src/client/ui/templates/messages/template.html b/src/client/ui/templates/messages/template.html index 5be45136..b64d0ce2 100644 --- a/src/client/ui/templates/messages/template.html +++ b/src/client/ui/templates/messages/template.html @@ -1,9 +1,9 @@
-
info
-
reputation
-
players
-
loot
+
info
+
reputation
+
players
+
loot
diff --git a/src/client/ui/templates/messages/tplTab.html b/src/client/ui/templates/messages/tplTab.html index 606fff75..5c74e14a 100644 --- a/src/client/ui/templates/messages/tplTab.html +++ b/src/client/ui/templates/messages/tplTab.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file