diff options
Diffstat (limited to 'app/assets/javascripts/issue_show/components')
4 files changed, 21 insertions, 25 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index 9b978483cc6..d153ff21a35 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -238,7 +238,7 @@ export default { : ''; }, statusIcon() { - return this.isClosed ? 'mobile-issue-close' : 'issue-open-m'; + return this.isClosed ? 'issue-close' : 'issue-open-m'; }, statusText() { return IssuableStatusText[this.issuableStatus]; diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index 20c759cfbbd..7733e366c4f 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -47,7 +47,7 @@ export default { }, deleteIssuableButtonText() { return sprintf(__('Delete %{issuableType}'), { - issuableType: issuableTypes[this.issuableType], + issuableType: issuableTypes[this.issuableType].toLowerCase(), }); }, }, @@ -79,23 +79,23 @@ export default { :loading="formState.updateLoading" :disabled="formState.updateLoading || !isSubmitEnabled" category="primary" - variant="success" - class="float-left qa-save-button" + variant="confirm" + class="float-left qa-save-button gl-mr-3" type="submit" @click.prevent="updateIssuable" > {{ __('Save changes') }} </gl-button> - <gl-button class="float-right" @click="closeForm"> + <gl-button @click="closeForm"> {{ __('Cancel') }} </gl-button> <gl-button v-if="shouldShowDeleteButton" :loading="deleteLoading" :disabled="deleteLoading" - category="primary" + category="secondary" variant="danger" - class="float-right gl-mr-3 qa-delete-button" + class="float-right qa-delete-button" @click="deleteIssuable" > {{ deleteIssuableButtonText }} diff --git a/app/assets/javascripts/issue_show/components/header_actions.vue b/app/assets/javascripts/issue_show/components/header_actions.vue index 2f2c4c6e341..2bddbe4faa0 100644 --- a/app/assets/javascripts/issue_show/components/header_actions.vue +++ b/app/assets/javascripts/issue_show/components/header_actions.vue @@ -1,5 +1,5 @@ <script> -import { GlButton, GlDropdown, GlDropdownItem, GlIcon, GlLink, GlModal } from '@gitlab/ui'; +import { GlButton, GlDropdown, GlDropdownItem, GlLink, GlModal } from '@gitlab/ui'; import { mapActions, mapGetters, mapState } from 'vuex'; import createFlash, { FLASH_TYPES } from '~/flash'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; @@ -17,7 +17,6 @@ export default { GlButton, GlDropdown, GlDropdownItem, - GlIcon, GlLink, GlModal, }, @@ -26,7 +25,6 @@ export default { }, actionPrimary: { text: __('Yes, close issue'), - attributes: [{ variant: 'warning' }], }, i18n: { promoteErrorMessage: __( @@ -88,9 +86,6 @@ export default { qaSelector() { return this.isClosed ? 'reopen_issue_button' : 'close_issue_button'; }, - buttonVariant() { - return this.isClosed ? 'default' : 'warning'; - }, dropdownText() { return sprintf(__('%{issueType} actions'), { issueType: capitalizeFirstCharacter(this.issueType), @@ -192,9 +187,9 @@ export default { </script> <template> - <div class="detail-page-header-actions"> + <div class="detail-page-header-actions gl-display-flex"> <gl-dropdown - class="gl-display-block gl-sm-display-none!" + class="gl-sm-display-none! w-100" block :text="dropdownText" :loading="isToggleStateButtonLoading" @@ -224,26 +219,22 @@ export default { <gl-button v-if="showToggleIssueStateButton" class="gl-display-none gl-sm-display-inline-flex!" - category="secondary" :data-qa-selector="qaSelector" :loading="isToggleStateButtonLoading" - :variant="buttonVariant" @click="toggleIssueState" > {{ buttonText }} </gl-button> <gl-dropdown - class="gl-display-none gl-sm-display-inline-flex!" - toggle-class="gl-border-0! gl-shadow-none!" + class="gl-display-none gl-sm-display-inline-flex! gl-ml-3" + icon="ellipsis_v" + category="tertiary" + :text="dropdownText" + :text-sr-only="true" no-caret right > - <template #button-content> - <gl-icon name="ellipsis_v" /> - <span class="gl-sr-only">{{ dropdownText }}</span> - </template> - <gl-dropdown-item v-if="canCreateIssue" :href="newIssuePath"> {{ newIssueTypeText }} </gl-dropdown-item> diff --git a/app/assets/javascripts/issue_show/components/title.vue b/app/assets/javascripts/issue_show/components/title.vue index 806d95ca748..5e92211685a 100644 --- a/app/assets/javascripts/issue_show/components/title.vue +++ b/app/assets/javascripts/issue_show/components/title.vue @@ -1,9 +1,13 @@ <script> import { GlButton, GlTooltipDirective, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; +import { __ } from '~/locale'; import eventHub from '../event_hub'; import animateMixin from '../mixins/animate'; export default { + i18n: { + editTitleAndDescription: __('Edit title and description'), + }, components: { GlButton, }, @@ -78,7 +82,8 @@ export default { v-gl-tooltip.bottom icon="pencil" class="btn-edit js-issuable-edit qa-edit-button" - title="Edit title and description" + :title="$options.i18n.editTitleAndDescription" + :aria-label="$options.i18n.editTitleAndDescription" @click="edit" /> </div> |