diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/assets/javascripts/set_status_modal/set_status_form.vue | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/set_status_modal/set_status_form.vue')
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_form.vue | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_form.vue b/app/assets/javascripts/set_status_modal/set_status_form.vue index 7f9a30b7ff1..86049a2b781 100644 --- a/app/assets/javascripts/set_status_modal/set_status_form.vue +++ b/app/assets/javascripts/set_status_modal/set_status_form.vue @@ -131,9 +131,9 @@ export default { i18n: { statusMessagePlaceholder: s__(`SetStatusModal|What's your status?`), clearStatusButtonLabel: s__('SetStatusModal|Clear status'), - availabilityCheckboxLabel: s__('SetStatusModal|Busy'), + availabilityCheckboxLabel: s__('SetStatusModal|Set yourself as busy'), availabilityCheckboxHelpText: s__( - 'SetStatusModal|An indicator appears next to your name and avatar', + 'SetStatusModal|Displays that you are busy or not able to respond', ), clearStatusAfterDropdownLabel: s__('SetStatusModal|Clear status after'), clearStatusAfterMessage: s__('SetStatusModal|Your status resets on %{date}.'), @@ -161,11 +161,7 @@ export default { @click="handleEmojiClick" > <template #button-content> - <span - v-if="noEmoji" - class="no-emoji-placeholder position-relative" - data-testid="no-emoji-placeholder" - > + <span v-if="noEmoji" class="gl-relative" data-testid="no-emoji-placeholder"> <gl-icon name="slight-smile" class="award-control-icon-neutral" /> <gl-icon name="smiley" class="award-control-icon-positive" /> <gl-icon name="smile" class="award-control-icon-super-positive" /> |