diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-02 18:10:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-02 18:10:19 +0300 |
commit | cef74ed0434b53fde0d7dcc2507b6f1639a63e7d (patch) | |
tree | 300bc30b6c4272cba3ab65297ede18bfffba2bd2 /app/assets | |
parent | ecdd26856c46b1e9e0c500701b36b6ae338e18a0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
4 files changed, 26 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/components/board_card_move_to_position.vue b/app/assets/javascripts/boards/components/board_card_move_to_position.vue index 9173503c888..398dcc494f7 100644 --- a/app/assets/javascripts/boards/components/board_card_move_to_position.vue +++ b/app/assets/javascripts/boards/components/board_card_move_to_position.vue @@ -1,6 +1,7 @@ <script> -import { GlDisclosureDropdown } from '@gitlab/ui'; +import { GlDisclosureDropdown, GlTooltipDirective } from '@gitlab/ui'; import Tracking from '~/tracking'; +import { s__ } from '~/locale'; import { BOARD_CARD_MOVE_TO_POSITIONS_OPTIONS, BOARD_CARD_MOVE_TO_POSITIONS_START_OPTION, @@ -12,6 +13,9 @@ export default { components: { GlDisclosureDropdown, }, + directives: { + GlTooltip: GlTooltipDirective, + }, mixins: [Tracking.mixin()], props: { item: { @@ -87,6 +91,9 @@ export default { } }, }, + i18n: { + moveCardText: s__('Boards|Card options'), + }, }; </script> @@ -94,12 +101,16 @@ export default { <gl-disclosure-dropdown ref="dropdown" :key="itemIdentifier" + v-gl-tooltip.hover.focus.top="{ + title: $options.i18n.moveCardText, + boundary: 'viewport', + }" class="move-to-position gl-display-block gl-mb-2 gl-ml-auto gl-mt-n3 gl-mr-n3 js-no-trigger" category="tertiary" :items="$options.BOARD_CARD_MOVE_TO_POSITIONS_OPTIONS" icon="ellipsis_v" :tabindex="index" - :toggle-text="s__('Boards|Move card')" + :aria-label="$options.i18n.moveCardText" :text-sr-only="true" no-caret data-testid="board-move-to-position" diff --git a/app/assets/javascripts/invite_members/components/invite_modal_base.vue b/app/assets/javascripts/invite_members/components/invite_modal_base.vue index 00b7c3f4bdd..574bbacc498 100644 --- a/app/assets/javascripts/invite_members/components/invite_modal_base.vue +++ b/app/assets/javascripts/invite_members/components/invite_modal_base.vue @@ -215,6 +215,7 @@ export default { this.$emit('reset'); }, onShowModal() { + this.$emit('shown'); if (this.usersLimitDataset.reachedLimit) { this.track('render', { category: 'default', label: ON_SHOW_TRACK_LABEL }); } diff --git a/app/assets/javascripts/super_sidebar/components/pinned_section.vue b/app/assets/javascripts/super_sidebar/components/pinned_section.vue index 05040218164..2be9f9e9f7d 100644 --- a/app/assets/javascripts/super_sidebar/components/pinned_section.vue +++ b/app/assets/javascripts/super_sidebar/components/pinned_section.vue @@ -116,7 +116,11 @@ export default { @pin-remove="onPinRemove(item.id, item.title)" /> </draggable> - <li v-else class="gl-text-secondary gl-font-sm gl-py-3" style="margin-left: 2.5rem"> + <li + v-else + class="gl-text-secondary gl-font-sm gl-py-3 super-sidebar-empty-pinned-text" + style="margin-left: 2.5rem" + > {{ $options.i18n.emptyHint }} </li> </menu-section> diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss index d8bccc49e29..5fcc24a1827 100644 --- a/app/assets/stylesheets/framework/super_sidebar.scss +++ b/app/assets/stylesheets/framework/super_sidebar.scss @@ -408,6 +408,13 @@ $super-sidebar-transition-hint-duration: $super-sidebar-transition-duration / 4; } } +.super-sidebar-empty-pinned-text { + mix-blend-mode: multiply; + + .gl-dark & { + mix-blend-mode: screen; + } +} // Styles for the ScrollScrim component. // Should eventually be moved to gitlab-ui. |