From 90db5147a3cfbdf7f7dd5cf6716881823a9e056d Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Mon, 21 Jul 2014 21:00:43 -0400 Subject: [PATCH 1/2] removing 100% image width from embedded posts --- app/assets/stylesheets/desktop/topic-post.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 54db048c001..2a804109d6e 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -232,12 +232,9 @@ nav.post-controls { .embedded-posts { h1, h2, h3 {margin: 10px 0;} a.mention {background: darken(scale-color-diff(), 10%);} - /* this 100% stuff is normally VERY dangerous because we're overriding - painstakingly calculated exact image widths, but in expanded replies, we may - be below minimum width, and expanded replies are loaded on demand anyway */ + p img { - width: 100%; - height: 100%; + max-width: 579px; } .topic-body { width: 84%; From 49605b1f2fbfebbbb4eb51f895b2de8a32612f11 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Mon, 21 Jul 2014 23:58:26 -0400 Subject: [PATCH 2/2] embdedded post alignment, minor fix --- app/assets/stylesheets/desktop/topic-post.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 2a804109d6e..364646a5785 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -237,7 +237,7 @@ nav.post-controls { max-width: 579px; } .topic-body { - width: 84%; + width: 86%; padding-left: 1%; padding-right: 1%; } @@ -260,10 +260,10 @@ nav.post-controls { // top means "in reply to expansion" above a post &.top { margin-left: 56px; - width: 690px; + width: 701px; } - &.top.topic-body {padding-left: 0;} + &.top.topic-body {padding-left: 0; padding-right: 0;} .post-date {color: scale-color($primary, $lightness: 50%);} .fa-arrow-up {margin-left: 5px;} .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}