Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2560 from awesomerobot/master 

removing 100% image width from embedded posts
This commit is contained in:
Jeff Atwood 2014-07-21 22:25:18 -07:00
parent a82cad78af 49605b1f2f
commit 037376fd72
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -232,15 +232,12 @@ nav.post-controls {
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
a.mention {background: darken(scale-color-diff(), 10%);} 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 { p img {
width: 100%; max-width: 579px;
height: 100%;
} }
.topic-body { .topic-body {
width: 84%; width: 86%;
padding-left: 1%; padding-left: 1%;
padding-right: 1%; padding-right: 1%;
} }
@ -263,10 +260,10 @@ nav.post-controls {
// top means "in reply to expansion" above a post // top means "in reply to expansion" above a post
&.top { &.top {
margin-left: 56px; 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%);} .post-date {color: scale-color($primary, $lightness: 50%);}
.fa-arrow-up {margin-left: 5px;} .fa-arrow-up {margin-left: 5px;}
.row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;} .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}