diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 09c8ffceb..9e93eb916 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -472,7 +472,7 @@ class Status extends ImmutablePureComponent {
}
if(sonsIds && sonsIds.size > 0) {
- sons =
{this.renderChildren(sonsIds)}
;
+ sons = {this.renderChildren(sonsIds)}
;
}
let deepRec;
diff --git a/app/javascript/styles/closed-social/timeline_comments.scss b/app/javascript/styles/closed-social/timeline_comments.scss
index d7eb8fafa..c9e3f136c 100644
--- a/app/javascript/styles/closed-social/timeline_comments.scss
+++ b/app/javascript/styles/closed-social/timeline_comments.scss
@@ -1,28 +1,29 @@
-.comments_timeline {
- height: 160px;
+.comments-timeline {
+ max-height: 160px;
+ min-width: 60%;
overflow: hidden;
-webkit-mask-image: linear-gradient(#1a1a1a,transparent);
mask-image: linear-gradient(#1a1a1a,transparent);
transform: scale(0.85);
transform-origin: 100% 0%;
margin-bottom: -32px;
- position: relative;
- z-index:99;
+ position: absolute;
+ z-index:9;
&:hover {
- overflow: visible;
+ max-height: none;
-webkit-mask-image: none;
mask-image: none;
- > div {
- background: lighten($ui-base-color, 5%);
- }
+ z-index:99;
+ background: $tc-background;
}
&:active {
- overflow: visible;
+ max-height: none;
-webkit-mask-image: none;
mask-image: none;
- > div {
- background: lighten($ui-base-color, 5%);
- }
+ background: $tc-background;
}
}
+.comments-timeline__wrapper {
+ height: 135px;
+}
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index a82c44229..390cd5370 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -39,6 +39,9 @@ $inverted-text-color: $ui-base-color !default;
$lighter-text-color: $ui-base-lighter-color !default;
$light-text-color: $ui-primary-color !default;
+//timeline comeents
+$tc-background: lighten($ui-base-color, 8%) !default;
+
// Language codes that uses CJK fonts
$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
diff --git a/app/javascript/styles/thu/variables.scss b/app/javascript/styles/thu/variables.scss
index 6b51d1d69..315324471 100644
--- a/app/javascript/styles/thu/variables.scss
+++ b/app/javascript/styles/thu/variables.scss
@@ -1,7 +1,8 @@
// Dependent colors
-$classic-base-color: rgba(48,43,56,0.85);
+$classic-base-color: rgba(40,44,55,0.8);
// Differences
$ui-base-color: $classic-base-color !default;
+$tc-background: rgba(50,41,64,0.9) !default;