krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

markdown preview - code "inherit white-space" / hide links for 'system'

Browse Source
This commit is contained in:
Negue
2015-04-27 19:47:42 +02:00
parent 75579a7c36
commit 189423b0db
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/public/css/index.styl
View File

@@ -187,3 +187,6 @@ a.label
color: #fff !important color: #fff !important
.line-through .line-through
text-decoration line-through text-decoration line-through
.markdown-preview markdown code
white-space inherit

4
website/public/js/controllers/groupsCtrl.js
View File

@@ -348,7 +348,9 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
$scope.copyToDo = function(message) { $scope.copyToDo = function(message) {
var taskNotes = env.t("messageWroteIn", { var taskNotes = env.t("messageWroteIn", {
user: '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')', user: message.uuid == 'system'
? 'system'
: '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')',
group: '[' + $scope.group.name + '](' + window.location.href + ')' group: '[' + $scope.group.name + '](' + window.location.href + ')'
}); });

2
website/views/shared/mixins.jade
View File

@@ -15,5 +15,5 @@ mixin aLink(url, label)
mixin previewMarkdown(text) mixin previewMarkdown(text)
.panel.panel-warning .panel.panel-warning
.panel-heading=env.t('msgPreviewHeading') .panel-heading=env.t('msgPreviewHeading')
.panel-body .panel-body.markdown-preview
markdown(text='#{text}') markdown(text='#{text}')