Commit 31e5dc77 authored by Phil Hughes's avatar Phil Hughes Committed by GitLab Release Tools Bot
Browse files

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

Fix suggested changes syntax highlighting

See merge request gitlab-org/gitlab-ce!25116

(cherry picked from commit d4b973fd)

adddcbd3 Fix suggested changes syntax highlighting
6d3626ef Add fix for suggested changes syntax highlighting
b12a8b35 Move note-related classes into note_body
3f3eff4b Fix eslint issue
22839d1c Move class to before @apply
parent 73547da0
......@@ -95,6 +95,7 @@ export default {
<div ref="note-body" :class="{ 'js-task-list-container': canEdit }" class="note-body">
<suggestions
v-if="hasSuggestion && !isEditing"
class="note-text md"
:suggestions="note.suggestions"
:note-html="note.note_html"
:line-type="lineType"
......
......@@ -130,6 +130,6 @@ export default {
<template>
<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>
</template>
......@@ -36,10 +36,6 @@
width: fit-content;
}
tbody {
background-color: $white-light;
}
tr {
th {
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