From 41ceb6ca88414cd5ee2b1902cbc06e77ae4a1ecd Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 5 Oct 2018 18:37:23 -0400 Subject: [PATCH] topic body and small action widths inconsistent --- app/assets/stylesheets/common/base/topic-post.scss | 2 +- app/assets/stylesheets/desktop/topic-post.scss | 3 +-- app/assets/stylesheets/desktop/topic.scss | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 1e74af02dfb..2fb3e97c130 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -623,7 +623,7 @@ blockquote > *:last-child { .small-action { display: flex; align-items: center; - max-width: 755px; + max-width: 758px; border-top: 1px solid $primary-low; .topic-avatar { align-self: flex-start; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index f0603b895e2..dfb19ab43cf 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -641,7 +641,7 @@ $topic-body-width: 690px; $topic-body-width-padding: 11px; $topic-avatar-width: 45px; .topic-body { - width: $topic-body-width; + width: calc(#{$topic-body-width} + calc(#{$topic-body-width-padding} * 2)); float: left; position: relative; z-index: z("base"); @@ -906,7 +906,6 @@ span.highlighted { .topic-body { box-sizing: border-box; width: calc(100% - 47px); //100% - [width of .topic-avatar + 2px] - padding-left: 2%; } .embedded-posts { // top means "in reply to expansion" above a post diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 8c80485618a..cfcdbc1714d 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -76,7 +76,7 @@ border-top: 1px solid $primary-low; padding: 10px 0; height: 20px; - max-width: 757px; + max-width: 758px; } #topic-progress-wrapper {