Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 9 deletions

diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/code_block.vue b/app/assets/javascripts/content_editor/components/bubble_menus/code_block.vue
index 5347f7c8712..e467053cd73 100644
--- a/app/assets/javascripts/content_editor/components/bubble_menus/code_block.vue
+++ b/app/assets/javascripts/content_editor/components/bubble_menus/code_block.vue
@@ -101,7 +101,7 @@ export default {
 <template>
   <bubble-menu
     data-testid="code-block-bubble-menu"
-    class="gl-shadow gl-rounded-base"
+    class="gl-shadow gl-rounded-base gl-bg-white"
     :editor="tiptapEditor"
     plugin-key="bubbleMenuCodeBlock"
     :should-show="shouldShow"
@@ -109,7 +109,12 @@ export default {
   >
     <editor-state-observer @transaction="updateSelectedLanguage">
       <gl-button-group>
-        <gl-dropdown contenteditable="false" boundary="viewport" :text="selectedLanguage.label">
+        <gl-dropdown
+          category="tertiary"
+          contenteditable="false"
+          boundary="viewport"
+          :text="selectedLanguage.label"
+        >
           <template #header>
             <gl-search-box-by-type
               v-model="filterTerm"
@@ -136,7 +141,7 @@ export default {
         <gl-button
           v-gl-tooltip
           variant="default"
-          category="primary"
+          category="tertiary"
           size="medium"
           data-testid="copy-code-block"
           :aria-label="__('Copy code')"
@@ -147,7 +152,7 @@ export default {
         <gl-button
           v-gl-tooltip
           variant="default"
-          category="primary"
+          category="tertiary"
           size="medium"
           data-testid="delete-code-block"
           :aria-label="__('Delete code block')"
diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue b/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
index 34e5caeca94..dba03a1e3e2 100644
--- a/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
+++ b/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
@@ -34,7 +34,7 @@ export default {
 <template>
   <bubble-menu
     data-testid="formatting-bubble-menu"
-    class="gl-shadow gl-rounded-base"
+    class="gl-shadow gl-rounded-base gl-bg-white"
     :editor="tiptapEditor"
     :should-show="shouldShow"
   >
@@ -44,7 +44,7 @@ export default {
         content-type="bold"
         icon-name="bold"
         editor-command="toggleBold"
-        category="primary"
+        category="tertiary"
         size="medium"
         :label="__('Bold text')"
         @execute="trackToolbarControlExecution"
@@ -54,7 +54,7 @@ export default {
         content-type="italic"
         icon-name="italic"
         editor-command="toggleItalic"
-        category="primary"
+        category="tertiary"
         size="medium"
         :label="__('Italic text')"
         @execute="trackToolbarControlExecution"
@@ -64,7 +64,7 @@ export default {
         content-type="strike"
         icon-name="strikethrough"
         editor-command="toggleStrike"
-        category="primary"
+        category="tertiary"
         size="medium"
         :label="__('Strikethrough')"
         @execute="trackToolbarControlExecution"
@@ -74,7 +74,7 @@ export default {
         content-type="code"
         icon-name="code"
         editor-command="toggleCode"
-        category="primary"
+        category="tertiary"
         size="medium"
         :label="__('Code')"
         @execute="trackToolbarControlExecution"