htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change date position

Browse Source
This commit is contained in:
Maximilian Grundke
2017-08-17 15:44:51 +02:00
parent 2c6ab19f36
commit 74a7deffa2
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/stylesheets/request-for-comments.css.scss
View File

@ -22,26 +22,39 @@
display: none !important; display: none !important;
} }
p.comment {
width: 400px;
}
.popover-header {
width: 100%;
overflow: hidden;
padding-bottom: 10px;
margin: auto;
}
.popover-username { .popover-username {
font-weight: bold; font-weight: bold;
width: 60%;
float: left;
}
.popover-date {
text-align: right;
color: #008cba;
margin-left: 60%;
font-size: x-small;
}
.popover-updated {
text-align: right;
margin-left: 60%;
font-size: x-small;
} }
.popover-comment { .popover-comment {
word-wrap: break-word; word-wrap: break-word;
}
.popover-footer {
margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
width: 100%;
}
.popover-date {
color: #008cba;
}
.popover-updated {
font-style: italic;
} }
.popover-divider { .popover-divider {
@ -49,6 +62,5 @@
height: 1px; height: 1px;
background-color: #008cba; background-color: #008cba;
overflow: hidden; overflow: hidden;
margin-top: -10px;
margin-bottom: 10px; margin-bottom: 10px;
} }

15
app/views/request_for_comments/show.html.erb
View File

@ -190,18 +190,19 @@ also, all settings from the rails model needed for the editor configuration in t
if (index !== 0) { if (index !== 0) {
popupContent += '<div class="popover-divider"></div>' popupContent += '<div class="popover-divider"></div>'
} }
popupContent += '<p>'; popupContent += '<p class="comment">';
popupContent += '<div class="popover-username">' + comment.username + ':</div>' + popupContent += '<div class="popover-header">' +
'<div class="popover-comment">' + preprocess(comment.text) + '</div>' + '<div class="popover-username">' + preprocess(comment.username) + '</div>' +
'<div class="popover-footer">' + '<div class="popover-date">' + comment.date + '</div>';
'<div class="popover-date">' + comment.date + '</div>';
if (comment.updated) { if (comment.updated) {
popupContent += '<div class="popover-updated">' + popupContent += '<div class="popover-updated">' +
'<i class="fa fa-pencil" aria-hidden="true"></i>' + '<i class="fa fa-pencil" aria-hidden="true"></i>' +
'<%= t('request_for_comments.comment_edited') %>' + '<%= t('request_for_comments.comment_edited') %>' +
'</div>' '</div>'
} }
popupContent += '</div></p>' popupContent += '</div>';
popupContent += '<div class="popover-comment">' + preprocess(comment.text) + '</div>';
popupContent += '</p>';
}); });
// attach the popover to the ace sidebar (where the comment icon is displayed) // attach the popover to the ace sidebar (where the comment icon is displayed)