IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-5356 - Fixing margins for paragraphs (#5217)

Browse Source 
* PLT-5356 - Fixing margins for paragraphs

* Fixing conflict

* Fixing font size for paragraphs
This commit is contained in:
Asaad Mahmood
2017-02-02 02:16:19 +05:00
committed by Christopher Speller
parent 36f43edba3
commit baf4b9a453
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/rhs_comment.jsx
View File

@@ -313,6 +313,10 @@ export default class RhsComment extends React.Component {
);
}
if (PostUtils.isEdited(this.props.post)) {
postClass += ' post--edited';
}
let systemMessageClass = '';
if (isSystemMessage) {
systemMessageClass = 'post--system';

17
webapp/components/rhs_root_post.jsx
View File

@@ -341,6 +341,7 @@ export default class RhsRootPost extends React.Component {
}
let compactClass = '';
let postClass = '';
if (this.props.compactDisplay) {
compactClass = 'post--compact';
@@ -362,6 +363,10 @@ export default class RhsRootPost extends React.Component {
}
}
if (PostUtils.isEdited(this.props.post)) {
postClass += ' post--edited';
}
const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
let flag;
@@ -447,11 +452,13 @@ export default class RhsRootPost extends React.Component {
</li>
</ul>
<div className='post__body'>
<PostBodyAdditionalContent
post={post}
message={<PostMessageContainer post={post}/>}
previewCollapsed={this.props.previewCollapsed}
/>
<div className={postClass}>
<PostBodyAdditionalContent
post={post}
message={<PostMessageContainer post={post}/>}
previewCollapsed={this.props.previewCollapsed}
/>
</div>
{fileAttachment}
<ReactionListContainer
post={post}

18
webapp/sass/layout/_post.scss
View File

@@ -717,32 +717,22 @@
.post--edited {
p {
&:last-child {
display: inline;
display: inline-block;
}
}
}
p {
font-size: .97em;
font-size: 13.5px;
line-height: 1.6em;
margin: 0;
white-space: pre-wrap;
&:last-child {
margin-bottom: .5em;
}
}
.post__header--info {
padding: 0;
}
span {
p:last-child {
margin-bottom: .5em;
}
}
&.post--root {
.comment-icon__container {
visibility: visible;
@@ -1023,7 +1013,7 @@
}
p + p {
margin: 1.2em 0;
margin: 1.2em 0 0;
&:last-of-type {
margin-bottom: 0;
@@ -1036,7 +1026,7 @@
ul,
ol {
font-size: .97em;
font-size: 13.5px;
margin-bottom: .4em;
padding-left: 20px;