From 774235c1f590b2157baa21602959af5b19422182 Mon Sep 17 00:00:00 2001 From: Z Date: Wed, 20 Nov 2019 21:44:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=9A=84=E5=B1=95=E5=BC=80=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../styles/closed-social/timeline_comments.scss | 16 ++++++++++++---- app/javascript/styles/thu/variables.scss | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/javascript/styles/closed-social/timeline_comments.scss b/app/javascript/styles/closed-social/timeline_comments.scss index dd1f29f49..d7eb8fafa 100644 --- a/app/javascript/styles/closed-social/timeline_comments.scss +++ b/app/javascript/styles/closed-social/timeline_comments.scss @@ -1,20 +1,28 @@ .comments_timeline { - max-height: 160px; + height: 160px; overflow: hidden; -webkit-mask-image: linear-gradient(#1a1a1a,transparent); mask-image: linear-gradient(#1a1a1a,transparent); transform: scale(0.85); - transform-origin: 80% 0%; + transform-origin: 100% 0%; margin-bottom: -32px; + position: relative; + z-index:99; &:hover { - max-height: 420px; + overflow: visible; -webkit-mask-image: none; mask-image: none; + > div { + background: lighten($ui-base-color, 5%); + } } &:active { - max-height: 420px; + overflow: visible; -webkit-mask-image: none; mask-image: none; + > div { + background: lighten($ui-base-color, 5%); + } } } diff --git a/app/javascript/styles/thu/variables.scss b/app/javascript/styles/thu/variables.scss index 54b2e500e..6b51d1d69 100644 --- a/app/javascript/styles/thu/variables.scss +++ b/app/javascript/styles/thu/variables.scss @@ -1,5 +1,5 @@ // Dependent colors -$classic-base-color: rgba(40,44,55,0.7); +$classic-base-color: rgba(48,43,56,0.85); // Differences $ui-base-color: $classic-base-color !default;