Skip to content
Snippets Groups Projects
Commit 7acfccb2 authored by Robert Hunt's avatar Robert Hunt
Browse files

Merge branch '360162-create-new-label-button-fix-focus' into 'master'

Create new label button: fix focus

See merge request gitlab-org/gitlab!88056
parents 42c593ad c85d2243
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -51,7 +51,7 @@ export default {
 
<template>
<div class="labels-select-contents-create js-labels-create">
<div class="dropdown-title d-flex align-items-center pt-0 pb-2">
<div class="dropdown-title d-flex align-items-center pt-0 pb-2 gl-mb-0">
<gl-button
:aria-label="__('Go back')"
variant="link"
Loading
Loading
@@ -95,7 +95,7 @@ export default {
></span>
<gl-form-input
v-model.trim="selectedColor"
class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
class="gl-rounded-top-left-none gl-rounded-bottom-left-none gl-mb-2"
:placeholder="__('Use custom color #FF0000')"
/>
</div>
Loading
Loading
Loading
Loading
@@ -23,7 +23,9 @@ export default {
</script>
 
<template>
<div class="hide-collapsed gl-line-height-20 gl-mb-2 gl-text-gray-900 gl-font-weight-bold">
<div
class="hide-collapsed gl-line-height-20 gl-mb-2 gl-text-gray-900 gl-font-weight-bold gl-mb-0"
>
{{ __('Labels') }}
<template v-if="allowLabelEdit">
<gl-loading-icon v-show="labelsSelectInProgress" size="sm" inline />
Loading
Loading
Loading
Loading
@@ -140,18 +140,19 @@ export default {
<template>
<div class="labels-select-contents-create js-labels-create">
<div class="dropdown-input">
<gl-alert v-if="error" variant="danger" :dismissible="false" class="gl-mb-3">
<gl-alert v-if="error" variant="danger" :dismissible="false" class="gl-mt-3">
{{ error }}
</gl-alert>
<gl-form-input
v-model.trim="labelTitle"
class="gl-mt-3"
:placeholder="__('Name new label')"
:autofocus="true"
data-testid="label-title-input"
/>
</div>
<div class="dropdown-content gl-px-3">
<div class="suggest-colors suggest-colors-dropdown gl-mt-0! gl-mb-3!">
<div class="suggest-colors suggest-colors-dropdown gl-mt-0! gl-mb-3! gl-mb-0">
<gl-link
v-for="(color, index) in suggestedColors"
:key="index"
Loading
Loading
@@ -169,7 +170,7 @@ export default {
></span>
<gl-form-input
v-model.trim="selectedColor"
class="gl-rounded-top-left-none gl-rounded-bottom-left-none"
class="gl-rounded-top-left-none gl-rounded-bottom-left-none gl-mb-2"
:placeholder="__('Use custom color #FF0000')"
data-testid="selected-color-text"
/>
Loading
Loading
Loading
Loading
@@ -51,7 +51,7 @@ export default {
<div data-testid="dropdown-header">
<div
v-if="!isStandalone"
class="dropdown-title gl-display-flex gl-align-items-center gl-pt-0 gl-pb-3!"
class="dropdown-title gl-display-flex gl-align-items-center gl-pt-0 gl-pb-3! gl-mb-0"
data-testid="dropdown-header-title"
>
<gl-button
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment