aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/assets/css/core
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-08-29 20:52:53 -0400
committerGitHub <noreply@github.com>2017-08-29 20:52:53 -0400
commita854dcc471078f4e21916730abb5d5d75dd7b03c (patch)
tree2ead8a34bc6d3e8a538ffd918ba721bca2d16c2a /app/src/main/assets/css/core
parent17fc9729554d7e5914e61165c6e634f6f1369d40 (diff)
downloadfrost-a854dcc471078f4e21916730abb5d5d75dd7b03c.tar.gz
frost-a854dcc471078f4e21916730abb5d5d75dd7b03c.tar.bz2
frost-a854dcc471078f4e21916730abb5d5d75dd7b03c.zip
Fix/message loading (#241)
* Switch basic user agent * Disable js * Disable clients * Disable edge chat blacklisting * Update theme for message highlights
Diffstat (limited to 'app/src/main/assets/css/core')
-rw-r--r--app/src/main/assets/css/core/core.compact.css24
-rw-r--r--app/src/main/assets/css/core/core.scss14
2 files changed, 25 insertions, 13 deletions
diff --git a/app/src/main/assets/css/core/core.compact.css b/app/src/main/assets/css/core/core.compact.css
index 0f25fc1e..2aede090 100644
--- a/app/src/main/assets/css/core/core.compact.css
+++ b/app/src/main/assets/css/core/core.compact.css
@@ -58,18 +58,26 @@ a, ._5fpq { color: #d59ed5 !important; }
.excessItem { outline: rgba(215, 176, 215, 0.3) !important; }
-@-webkit-keyframes highlightFade { 0% { background: rgba(199, 70, 70, 0.2); }
- 50% { background: rgba(199, 70, 70, 0.2); }
+@-webkit-keyframes highlightFade { 0%, 50% { background: rgba(199, 70, 70, 0.2); }
100% { background: rgba(255, 0, 255, 0.02); } }
-@-moz-keyframes highlightFade { 0% { background: rgba(199, 70, 70, 0.2); }
- 50% { background: rgba(199, 70, 70, 0.2); }
+@-moz-keyframes highlightFade { 0%, 50% { background: rgba(199, 70, 70, 0.2); }
100% { background: rgba(255, 0, 255, 0.02); } }
-@-ms-keyframes highlightFade { 0% { background: rgba(199, 70, 70, 0.2); }
- 50% { background: rgba(199, 70, 70, 0.2); }
+@-ms-keyframes highlightFade { 0%, 50% { background: rgba(199, 70, 70, 0.2); }
100% { background: rgba(255, 0, 255, 0.02); } }
-@keyframes highlightFade { 0% { background: rgba(199, 70, 70, 0.2); }
- 50% { background: rgba(199, 70, 70, 0.2); }
+@keyframes highlightFade { 0%, 50% { background: rgba(199, 70, 70, 0.2); }
100% { background: rgba(255, 0, 255, 0.02); } }
+
+@-webkit-keyframes chatHighlightAnimation { 0%, 100% { background: rgba(255, 0, 255, 0.02); }
+ 50% { background: rgba(199, 70, 70, 0.2); } }
+
+@-moz-keyframes chatHighlightAnimation { 0%, 100% { background: rgba(255, 0, 255, 0.02); }
+ 50% { background: rgba(199, 70, 70, 0.2); } }
+
+@-ms-keyframes chatHighlightAnimation { 0%, 100% { background: rgba(255, 0, 255, 0.02); }
+ 50% { background: rgba(199, 70, 70, 0.2); } }
+
+@keyframes chatHighlightAnimation { 0%, 100% { background: rgba(255, 0, 255, 0.02); }
+ 50% { background: rgba(199, 70, 70, 0.2); } }
diff --git a/app/src/main/assets/css/core/core.scss b/app/src/main/assets/css/core/core.scss
index f50721f0..34e24b31 100644
--- a/app/src/main/assets/css/core/core.scss
+++ b/app/src/main/assets/css/core/core.scss
@@ -160,15 +160,19 @@ a,
//new comment
@include keyframes(highlightFade) {
- 0% {
+ 0%, 50% {
background: $background2;
}
-
- 50% {
- background: $background2;
+ 100% {
+ background: $bg_transparent;
}
+}
- 100% {
+@include keyframes(chatHighlightAnimation) {
+ 0%,100% {
background: $bg_transparent;
}
+ 50% {
+ background: $background2;
+ }
}