diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 15:07:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-04 15:07:48 +0300 |
commit | 8ed0a009f0ae0de789fae01b3cc9bda54aa03965 (patch) | |
tree | dc1006335110a668ad12eb6bbcb514ba6636dea3 /app/assets/javascripts/boards | |
parent | 48640cf76a1ee0cd515e259d8f3eb2de25ba01c3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/components/board_add_new_column_form.vue | 26 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/board_content.vue | 2 |
2 files changed, 10 insertions, 18 deletions
diff --git a/app/assets/javascripts/boards/components/board_add_new_column_form.vue b/app/assets/javascripts/boards/components/board_add_new_column_form.vue index 70ba90bb1d4..10c7a3db2d3 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column_form.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column_form.vue @@ -80,17 +80,14 @@ export default { <template> <div - class="board-add-new-list board gl-display-inline-block gl-h-full gl-px-3 gl-vertical-align-top gl-white-space-normal gl-flex-shrink-0" + class="board-add-new-list board gl-display-inline-block gl-h-full gl-vertical-align-top gl-white-space-normal gl-flex-shrink-0 gl-rounded-base gl-px-3" data-testid="board-add-new-column" data-qa-selector="board_add_new_list" > <div - class="board-inner gl-display-flex gl-flex-direction-column gl-relative gl-h-full gl-rounded-base gl-bg-white" + class="board-inner gl-display-flex gl-flex-direction-column gl-relative gl-h-full gl-rounded-base" > - <h3 - class="gl-font-size-h2 gl-px-5 gl-py-4 gl-m-0 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100" - data-testid="board-add-column-form-title" - > + <h3 class="gl-font-size-h2 gl-px-5 gl-py-5 gl-m-0" data-testid="board-add-column-form-title"> {{ $options.i18n.newList }} </h3> @@ -98,7 +95,7 @@ export default { class="gl-display-flex gl-flex-direction-column gl-h-full gl-overflow-y-auto gl-align-items-flex-start" > <div class="gl-px-5"> - <h3 class="gl-font-lg gl-mt-5 gl-mb-2"> + <h3 class="gl-font-lg gl-mt-3 gl-mb-2"> {{ $options.i18n.scope }} </h3> <p class="gl-mb-3">{{ $options.i18n.scopeDescription }}</p> @@ -147,23 +144,18 @@ export default { </gl-dropdown> </gl-form-group> </div> - <div - class="gl-display-flex gl-p-3 gl-border-t-1 gl-border-t-solid gl-border-gray-100 gl-bg-gray-10 gl-rounded-bottom-left-base gl-rounded-bottom-right-base" - > - <gl-button - data-testid="cancelAddNewColumn" - class="gl-ml-auto gl-mr-3" - @click="setAddColumnFormVisibility(false)" - >{{ $options.i18n.cancel }}</gl-button - > + <div class="gl-display-flex gl-mb-4"> <gl-button data-testid="addNewColumnButton" :disabled="!selectedId" variant="confirm" - class="gl-mr-4" + class="gl-mr-3 gl-ml-4" @click="$emit('add-list')" >{{ $options.i18n.add }}</gl-button > + <gl-button data-testid="cancelAddNewColumn" @click="setAddColumnFormVisibility(false)">{{ + $options.i18n.cancel + }}</gl-button> </div> </div> </div> diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue index 5c6d7748edd..8868b9b2f3e 100644 --- a/app/assets/javascripts/boards/components/board_content.vue +++ b/app/assets/javascripts/boards/components/board_content.vue @@ -75,7 +75,7 @@ export default { v-if="!isSwimlanesOn" ref="list" v-bind="draggableOptions" - class="boards-list gl-w-full gl-py-5 gl-px-3 gl-white-space-nowrap" + class="boards-list gl-w-full gl-py-5 gl-pr-3 gl-white-space-nowrap" @end="moveList" > <board-column |