Commit d4b973fd authored by Phil Hughes's avatar Phil Hughes

Merge branch 'syntax-highlighting-again' into 'master'

Fix suggested changes syntax highlighting

See merge request gitlab-org/gitlab-ce!25116
parents 750e3c67 f9303eec
...@@ -95,6 +95,7 @@ export default { ...@@ -95,6 +95,7 @@ export default {
<div ref="note-body" :class="{ 'js-task-list-container': canEdit }" class="note-body"> <div ref="note-body" :class="{ 'js-task-list-container': canEdit }" class="note-body">
<suggestions <suggestions
v-if="hasSuggestion && !isEditing" v-if="hasSuggestion && !isEditing"
class="note-text md"
:suggestions="note.suggestions" :suggestions="note.suggestions"
:note-html="note.note_html" :note-html="note.note_html"
:line-type="lineType" :line-type="lineType"
......
...@@ -130,6 +130,6 @@ export default { ...@@ -130,6 +130,6 @@ export default {
<template> <template>
<div> <div>
<div class="flash-container js-suggestions-flash"></div> <div class="flash-container js-suggestions-flash"></div>
<div v-show="isRendered" ref="container" class="note-text md" v-html="noteHtml"></div> <div v-show="isRendered" ref="container" v-html="noteHtml"></div>
</div> </div>
</template> </template>
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
width: fit-content; width: fit-content;
} }
tbody {
background-color: $white-light;
}
tr { tr {
th { th {
border-bottom: solid 2px $gl-gray-100; border-bottom: solid 2px $gl-gray-100;
......
---
title: Fix suggested changes syntax highlighting
merge_request: 25116
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment