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

revision history: proper word-wrap in markdown view

This commit is contained in:
Régis Hanol 2013-12-16 15:57:13 +01:00
parent c6fb60e0a0
commit fd749a9c6e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/modal/history.js.handlebars
View File

@ -19,6 +19,8 @@
<div id="revision-details"> <div id="revision-details">
{{i18n post.revisions.details.edited_by}} {{avatar this imageSize="small"}} {{username}} <span class="date">{{date path="created_at" leaveAgo="true"}}</span> {{#if edit_reason}} &mdash; <span class="edit-reason">{{edit_reason}}</span>{{/if}} {{i18n post.revisions.details.edited_by}} {{avatar this imageSize="small"}} {{username}} <span class="date">{{date path="created_at" leaveAgo="true"}}</span> {{#if edit_reason}} &mdash; <span class="edit-reason">{{edit_reason}}</span>{{/if}}
</div> </div>
<div id="revisions">
{{{diff}}} {{{diff}}}
</div>
{{/if}} {{/if}}
</div> </div>

9
app/assets/stylesheets/desktop/history.scss
View File

@ -19,17 +19,17 @@
padding: 5px; padding: 5px;
margin-top: 10px; margin-top: 10px;
} }
#revisions {
word-wrap: break-word;
}
img { img {
max-width: 670px; max-width: 670px;
height: auto; height: auto;
} }
.inline-diff { .inline-diff {
width: 670px; width: 670px;
word-wrap: break-word;
} }
.markdown { .markdown {
word-wrap: break-word;
white-space: pre-wrap;
font-family: monospace; font-family: monospace;
font-size: 12px; font-size: 12px;
width: 100%; width: 100%;
@ -38,6 +38,9 @@
td { td {
width: 50%; width: 50%;
vertical-align: top; vertical-align: top;
max-width: 440px;
word-wrap: break-word;
white-space: pre-wrap;
} }
} }
.span8, .markdown { .span8, .markdown {