diff options
author | Phil Hughes <me@iamphill.com> | 2019-02-14 16:01:47 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-14 16:09:56 +0000 |
commit | 31e5dc77290cd507088223a5017157cd1e973e7b (patch) | |
tree | db2e335d32b210af6b73a80d683fcb922dc29b18 | |
parent | 73547da0003741ff6d574d2556557c157a90238f (diff) | |
download | gitlab-ce-31e5dc77290cd507088223a5017157cd1e973e7b.tar.gz |
Merge branch 'syntax-highlighting-again' into 'master'
Fix suggested changes syntax highlighting
See merge request gitlab-org/gitlab-ce!25116
(cherry picked from commit d4b973fd515f70ead359510e553173bb2be8a802)
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
4 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index ff303d0f55a..fb1d98355b3 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -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" diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index c33665c24f6..dcda701f049 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -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> diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 9837b1a6bd0..b9d0c0d4d96 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -36,10 +36,6 @@ width: fit-content; } - tbody { - background-color: $white-light; - } - tr { th { border-bottom: solid 2px $gl-gray-100; diff --git a/changelogs/unreleased/syntax-highlighting-again.yml b/changelogs/unreleased/syntax-highlighting-again.yml new file mode 100644 index 00000000000..14223fc0927 --- /dev/null +++ b/changelogs/unreleased/syntax-highlighting-again.yml @@ -0,0 +1,5 @@ +--- +title: Fix suggested changes syntax highlighting +merge_request: 25116 +author: +type: fixed |