Skip to content
Snippets Groups Projects

Unifies the sidebar width for work items and border color

Merged Sascha Eggenberger requested to merge unify-sidebar-width-and-borders into master
6 files
+ 41
22
Compare changes
  • Side-by-side
  • Inline
Files
6
@@ -138,51 +138,49 @@ export default {
@@ -138,51 +138,49 @@ export default {
};
};
</script>
</script>
<template>
<template>
<div>
<gl-loading-icon v-if="isLoading" class="gl-my-2" />
<gl-loading-icon v-if="isLoading" class="gl-my-2" />
<div v-else-if="shouldShowDevWidget" class="work-item-attributes-item">
<div v-if="shouldShowDevWidget" class="gl-border-t gl-mb-5 gl-border-gray-50 gl-pt-5">
<div class="gl-flex gl-items-center gl-justify-between gl-gap-3">
<div class="gl-flex gl-items-center gl-justify-between gl-gap-3">
<h3
<h3
class="gl-heading-5 !gl-mb-0 gl-flex gl-items-center gl-gap-2"
class="gl-heading-5 !gl-mb-0 gl-flex gl-items-center gl-gap-2"
data-testid="dev-widget-label"
data-testid="dev-widget-label"
>
>
{{ $options.i18n.development }}
{{ $options.i18n.development }}
<gl-button
v-if="showAutoCloseInformation"
v-gl-tooltip
class="!gl-p-0 hover:!gl-bg-transparent"
category="tertiary"
:title="tooltipText"
:aria-label="tooltipText"
data-testid="more-information"
>
<gl-icon name="information-o" class="!gl-text-blue-500" />
</gl-button>
</h3>
<gl-button
<gl-button
v-if="showAddButton"
v-if="showAutoCloseInformation"
v-gl-modal="$options.createMRModalId"
v-gl-tooltip
v-gl-tooltip.top
class="!gl-p-0 hover:!gl-bg-transparent"
category="tertiary"
category="tertiary"
icon="plus"
:title="tooltipText"
size="small"
:aria-label="tooltipText"
data-testid="add-item"
data-testid="more-information"
:title="__('Add branch or merge request')"
>
:aria-label="__('Add branch or merge request')"
<gl-icon name="information-o" class="!gl-text-blue-500" />
/>
</gl-button>
</div>
</h3>
<template v-if="isRelatedDevelopmentListEmpty">
<gl-button
<span v-if="!canUpdate" class="gl-text-secondary">{{ __('None') }}</span>
v-if="showAddButton"
<template v-else>
v-gl-modal="$options.createMRModalId"
<gl-button category="secondary" size="small" data-testid="create-mr-button">{{
v-gl-tooltip.top
$options.i18n.createMergeRequest
category="tertiary"
}}</gl-button>
icon="plus"
<gl-button category="tertiary" size="small" data-testid="create-branch-button">{{
size="small"
$options.i18n.createBranch
data-testid="add-item"
}}</gl-button>
:title="__('Add branch or merge request')"
</template>
:aria-label="__('Add branch or merge request')"
</template>
/>
<work-item-development-relationship-list v-else :work-item-dev-widget="workItemDevelopment" />
</div>
</div>
 
<template v-if="isRelatedDevelopmentListEmpty">
 
<span v-if="!canUpdate" class="gl-text-secondary">{{ __('None') }}</span>
 
<template v-else>
 
<gl-button category="secondary" size="small" data-testid="create-mr-button">{{
 
$options.i18n.createMergeRequest
 
}}</gl-button>
 
<gl-button category="tertiary" size="small" data-testid="create-branch-button">{{
 
$options.i18n.createBranch
 
}}</gl-button>
 
</template>
 
</template>
 
<work-item-development-relationship-list v-else :work-item-dev-widget="workItemDevelopment" />
</div>
</div>
</template>
</template>
Loading