Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-08 00:09:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-08 00:09:22 +0300
commit2f8483621ea55d217f8ee92d22ba2ce0c250d0b0 (patch)
treeb2a22b2fe2bea49fd5027bd251bbf03d8d470575 /app/assets/javascripts/content_editor
parent17b492274d1071f9dce56d1a3f2d57c94c38e709 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/content_editor')
-rw-r--r--app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue26
1 files changed, 13 insertions, 13 deletions
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 a1e18aa52e7..f0726ff3e63 100644
--- a/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
+++ b/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
@@ -91,19 +91,6 @@ export default {
@execute="trackToolbarControlExecution"
/>
<toolbar-button
- data-testid="link"
- content-type="link"
- icon-name="link"
- editor-command="toggleLink"
- :editor-command-params="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
- href: '',
- } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
- category="tertiary"
- size="medium"
- :label="__('Insert link')"
- @execute="trackToolbarControlExecution"
- />
- <toolbar-button
data-testid="superscript"
content-type="superscript"
icon-name="superscript"
@@ -123,6 +110,19 @@ export default {
:label="__('Subscript')"
@execute="trackToolbarControlExecution"
/>
+ <toolbar-button
+ data-testid="link"
+ content-type="link"
+ icon-name="link"
+ editor-command="toggleLink"
+ :editor-command-params="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ {
+ href: '',
+ } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
+ category="tertiary"
+ size="medium"
+ :label="__('Insert link')"
+ @execute="trackToolbarControlExecution"
+ />
</gl-button-group>
</bubble-menu>
</template>