Skip to content
Snippets Groups Projects
Unverified Commit 5b9495c5 authored by Mike Greiling's avatar Mike Greiling
Browse files

Prettify all the things

parent 29d129d2
No related branches found
No related tags found
No related merge requests found
Showing
with 130 additions and 338 deletions
Loading
@@ -65,12 +65,7 @@ export default {
Loading
@@ -65,12 +65,7 @@ export default {
   
<template> <template>
<div> <div>
<a <a v-show="!isLoading && !hasError" :href="linkUrl" target="_blank" rel="noopener noreferrer">
v-show="!isLoading && !hasError"
:href="linkUrl"
target="_blank"
rel="noopener noreferrer"
>
<img <img
:src="imageUrlWithRetries" :src="imageUrlWithRetries"
class="project-badge" class="project-badge"
Loading
@@ -80,15 +75,9 @@ export default {
Loading
@@ -80,15 +75,9 @@ export default {
/> />
</a> </a>
   
<gl-loading-icon <gl-loading-icon v-show="isLoading" :inline="true" />
v-show="isLoading"
:inline="true"
/>
   
<div <div v-show="hasError" class="btn-group">
v-show="hasError"
class="btn-group"
>
<div class="btn btn-default btn-sm disabled"> <div class="btn btn-default btn-sm disabled">
<icon <icon
:size="16" :size="16"
Loading
@@ -97,9 +86,7 @@ export default {
Loading
@@ -97,9 +86,7 @@ export default {
aria-hidden="true" aria-hidden="true"
/> />
</div> </div>
<div <div class="btn btn-default btn-sm disabled">
class="btn btn-default btn-sm disabled"
>
<span class="prepend-left-8 append-right-8">{{ s__('Badges|No badge image') }}</span> <span class="prepend-left-8 append-right-8">{{ s__('Badges|No badge image') }}</span>
</div> </div>
</div> </div>
Loading
@@ -112,10 +99,7 @@ export default {
Loading
@@ -112,10 +99,7 @@ export default {
type="button" type="button"
@click="reloadImage" @click="reloadImage"
> >
<icon <icon :size="16" name="retry" />
:size="16"
name="retry"
/>
</button> </button>
</div> </div>
</template> </template>
Loading
@@ -155,10 +155,7 @@ export default {
Loading
@@ -155,10 +155,7 @@ export default {
@submit.prevent.stop="onSubmit" @submit.prevent.stop="onSubmit"
> >
<div class="form-group"> <div class="form-group">
<label <label for="badge-link-url" class="label-bold">{{ s__('Badges|Link') }}</label>
for="badge-link-url"
class="label-bold"
>{{ s__('Badges|Link') }}</label>
<p v-html="helpText"></p> <p v-html="helpText"></p>
<input <input
id="badge-link-url" id="badge-link-url"
Loading
@@ -168,19 +165,12 @@ export default {
Loading
@@ -168,19 +165,12 @@ export default {
required required
@input="debouncedPreview" @input="debouncedPreview"
/> />
<div class="invalid-feedback"> <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div>
{{ s__('Badges|Please fill in a valid URL') }} <span class="form-text text-muted"> {{ badgeLinkUrlExample }} </span>
</div>
<span class="form-text text-muted">
{{ badgeLinkUrlExample }}
</span>
</div> </div>
   
<div class="form-group"> <div class="form-group">
<label <label for="badge-image-url" class="label-bold">{{ s__('Badges|Badge image URL') }}</label>
for="badge-image-url"
class="label-bold"
>{{ s__('Badges|Badge image URL') }}</label>
<p v-html="helpText"></p> <p v-html="helpText"></p>
<input <input
id="badge-image-url" id="badge-image-url"
Loading
@@ -190,12 +180,8 @@ export default {
Loading
@@ -190,12 +180,8 @@ export default {
required required
@input="debouncedPreview" @input="debouncedPreview"
/> />
<div class="invalid-feedback"> <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div>
{{ s__('Badges|Please fill in a valid URL') }} <span class="form-text text-muted"> {{ badgeImageUrlExample }} </span>
</div>
<span class="form-text text-muted">
{{ badgeImageUrlExample }}
</span>
</div> </div>
   
<div class="form-group"> <div class="form-group">
Loading
@@ -206,37 +192,22 @@ export default {
Loading
@@ -206,37 +192,22 @@ export default {
:image-url="renderedImageUrl" :image-url="renderedImageUrl"
:link-url="renderedLinkUrl" :link-url="renderedLinkUrl"
/> />
<p v-show="isRendering"> <p v-show="isRendering"><gl-loading-icon :inline="true" /></p>
<gl-loading-icon <p v-show="!renderedBadge && !isRendering" class="disabled-content">
:inline="true" {{ s__('Badges|No image to preview') }}
/>
</p> </p>
<p
v-show="!renderedBadge && !isRendering"
class="disabled-content"
>{{ s__('Badges|No image to preview') }}</p>
</div> </div>
   
<div <div v-if="isEditing" class="row-content-block">
v-if="isEditing"
class="row-content-block"
>
<loading-button <loading-button
:loading="isSaving" :loading="isSaving"
:label="s__('Badges|Save changes')" :label="s__('Badges|Save changes')"
type="submit" type="submit"
container-class="btn btn-success" container-class="btn btn-success"
/> />
<button <button class="btn btn-cancel" type="button" @click="onCancel">{{ __('Cancel') }}</button>
class="btn btn-cancel"
type="button"
@click="onCancel"
>{{ __('Cancel') }}</button>
</div> </div>
<div <div v-else class="form-group">
v-else
class="form-group"
>
<loading-button <loading-button
:loading="isSaving" :loading="isSaving"
:label="s__('Badges|Add badge')" :label="s__('Badges|Add badge')"
Loading
Loading
Loading
@@ -26,32 +26,15 @@ export default {
Loading
@@ -26,32 +26,15 @@ export default {
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
{{ s__('Badges|Your badges') }} {{ s__('Badges|Your badges') }}
<span <span v-show="!isLoading" class="badge badge-pill">{{ badges.length }}</span>
v-show="!isLoading"
class="badge badge-pill"
>{{ badges.length }}</span>
</div> </div>
<gl-loading-icon <gl-loading-icon v-show="isLoading" :size="2" class="card-body" />
v-show="isLoading" <div v-if="hasNoBadges" class="card-body">
:size="2"
class="card-body"
/>
<div
v-if="hasNoBadges"
class="card-body"
>
<span v-if="isGroupBadge">{{ s__('Badges|This group has no badges') }}</span> <span v-if="isGroupBadge">{{ s__('Badges|This group has no badges') }}</span>
<span v-else>{{ s__('Badges|This project has no badges') }}</span> <span v-else>{{ s__('Badges|This project has no badges') }}</span>
</div> </div>
<div <div v-else class="card-body">
v-else <badge-list-row v-for="badge in badges" :key="badge.id" :badge="badge" />
class="card-body"
>
<badge-list-row
v-for="badge in badges"
:key="badge.id"
:badge="badge"
/>
</div> </div>
</div> </div>
</template> </template>
Loading
@@ -50,20 +50,14 @@ export default {
Loading
@@ -50,20 +50,14 @@ export default {
<span class="badge badge-pill">{{ badgeKindText }}</span> <span class="badge badge-pill">{{ badgeKindText }}</span>
</div> </div>
<div class="table-section section-15 table-button-footer"> <div class="table-section section-15 table-button-footer">
<div <div v-if="canEditBadge" class="table-action-buttons">
v-if="canEditBadge"
class="table-action-buttons">
<button <button
:disabled="badge.isDeleting" :disabled="badge.isDeleting"
class="btn btn-default append-right-8" class="btn btn-default append-right-8"
type="button" type="button"
@click="editBadge(badge)" @click="editBadge(badge);"
> >
<icon <icon :size="16" :aria-label="__('Edit')" name="pencil" />
:size="16"
:aria-label="__('Edit')"
name="pencil"
/>
</button> </button>
<button <button
:disabled="badge.isDeleting" :disabled="badge.isDeleting"
Loading
@@ -71,18 +65,11 @@ export default {
Loading
@@ -71,18 +65,11 @@ export default {
type="button" type="button"
data-toggle="modal" data-toggle="modal"
data-target="#delete-badge-modal" data-target="#delete-badge-modal"
@click="updateBadgeInModal(badge)" @click="updateBadgeInModal(badge);"
> >
<icon <icon :size="16" :aria-label="__('Delete')" name="remove" />
:size="16"
:aria-label="__('Delete')"
name="remove"
/>
</button> </button>
<gl-loading-icon <gl-loading-icon v-show="badge.isDeleting" :inline="true" />
v-show="badge.isDeleting"
:inline="true"
/>
</div> </div>
</div> </div>
</div> </div>
Loading
Loading
Loading
@@ -46,7 +46,8 @@ export default {
Loading
@@ -46,7 +46,8 @@ export default {
:header-title-text="s__('Badges|Delete badge?')" :header-title-text="s__('Badges|Delete badge?')"
:footer-primary-button-text="s__('Badges|Delete badge')" :footer-primary-button-text="s__('Badges|Delete badge')"
footer-primary-button-variant="danger" footer-primary-button-variant="danger"
@submit="onSubmitModal"> @submit="onSubmitModal"
>
<div class="well"> <div class="well">
<badge <badge
:image-url="badgeInModal ? badgeInModal.renderedImageUrl : ''" :image-url="badgeInModal ? badgeInModal.renderedImageUrl : ''"
Loading
@@ -56,15 +57,9 @@ export default {
Loading
@@ -56,15 +57,9 @@ export default {
<p v-html="deleteModalText"></p> <p v-html="deleteModalText"></p>
</gl-modal> </gl-modal>
   
<badge-form <badge-form v-show="isEditing" :is-editing="true" />
v-show="isEditing"
:is-editing="true"
/>
   
<badge-form <badge-form v-show="!isEditing" :is-editing="false" />
v-show="!isEditing"
:is-editing="false"
/>
<badge-list v-show="!isEditing" /> <badge-list v-show="!isEditing" />
</div> </div>
</template> </template>
Loading
@@ -23,10 +23,12 @@ export default class BlobViewer {
Loading
@@ -23,10 +23,12 @@ export default class BlobViewer {
if (!viewer || !viewer.dataset.richType) return; if (!viewer || !viewer.dataset.richType) return;
   
const initViewer = promise => const initViewer = promise =>
promise.then(module => module.default(viewer)).catch(error => { promise
Flash('Error loading file viewer.'); .then(module => module.default(viewer))
throw error; .catch(error => {
}); Flash('Error loading file viewer.');
throw error;
});
   
switch (viewer.dataset.richType) { switch (viewer.dataset.richType) {
case 'balsamiq': case 'balsamiq':
Loading
Loading
Loading
@@ -61,35 +61,25 @@ export default {
Loading
@@ -61,35 +61,25 @@ export default {
   
<template> <template>
<div class="board-blank-state"> <div class="board-blank-state">
<p> <p>Add the following default lists to your Issue Board with one click:</p>
Add the following default lists to your Issue Board with one click:
</p>
<ul class="board-blank-state-list"> <ul class="board-blank-state-list">
<li <li v-for="(label, index) in predefinedLabels" :key="index">
v-for="(label, index) in predefinedLabels" <span :style="{ backgroundColor: label.color }" class="label-color"> </span>
:key="index"
>
<span
:style="{ backgroundColor: label.color }"
class="label-color">
</span>
{{ label.title }} {{ label.title }}
</li> </li>
</ul> </ul>
<p> <p>
Starting out with the default set of lists will get you Starting out with the default set of lists will get you right on the way to making the most of
right on the way to making the most of your board. your board.
</p> </p>
<button <button
class="btn btn-success btn-inverted btn-block" class="btn btn-success btn-inverted btn-block"
type="button" type="button"
@click.stop="addDefaultLists"> @click.stop="addDefaultLists"
>
Add default lists Add default lists
</button> </button>
<button <button class="btn btn-default btn-block" type="button" @click.stop="clearBlankState">
class="btn btn-default btn-block"
type="button"
@click.stop="clearBlankState">
Nevermind, I'll use my own Nevermind, I'll use my own
</button> </button>
</div> </div>
Loading
Loading
Loading
@@ -79,14 +79,15 @@ export default {
Loading
@@ -79,14 +79,15 @@ export default {
:class="{ :class="{
'user-can-drag': !disabled && issue.id, 'user-can-drag': !disabled && issue.id,
'is-disabled': disabled || !issue.id, 'is-disabled': disabled || !issue.id,
'is-active': issueDetailVisible 'is-active': issueDetailVisible,
}" }"
:index="index" :index="index"
:data-issue-id="issue.id" :data-issue-id="issue.id"
class="board-card" class="board-card"
@mousedown="mouseDown" @mousedown="mouseDown"
@mousemove="mouseMove" @mousemove="mouseMove"
@mouseup="showIssue($event)"> @mouseup="showIssue($event);"
>
<issue-card-inner <issue-card-inner
:list="list" :list="list"
:issue="issue" :issue="issue"
Loading
Loading
Loading
@@ -222,23 +222,22 @@ export default {
Loading
@@ -222,23 +222,22 @@ export default {
   
<template> <template>
<div class="board-list-component"> <div class="board-list-component">
<div <div v-if="loading" class="board-list-loading text-center" aria-label="Loading issues">
v-if="loading"
class="board-list-loading text-center"
aria-label="Loading issues">
<gl-loading-icon /> <gl-loading-icon />
</div> </div>
<board-new-issue <board-new-issue
v-if="list.type !== 'closed' && showIssueForm" v-if="list.type !== 'closed' && showIssueForm"
:group-id="groupId" :group-id="groupId"
:list="list"/> :list="list"
/>
<ul <ul
v-show="!loading" v-show="!loading"
ref="list" ref="list"
:data-board="list.id" :data-board="list.id"
:data-board-type="list.type" :data-board-type="list.type"
:class="{ 'is-smaller': showIssueForm }" :class="{ 'is-smaller': showIssueForm }"
class="board-list js-board-list"> class="board-list js-board-list"
>
<board-card <board-card
v-for="(issue, index) in issues" v-for="(issue, index) in issues"
ref="issue" ref="issue"
Loading
@@ -249,25 +248,12 @@ export default {
Loading
@@ -249,25 +248,12 @@ export default {
:issue-link-base="issueLinkBase" :issue-link-base="issueLinkBase"
:group-id="groupId" :group-id="groupId"
:root-path="rootPath" :root-path="rootPath"
:disabled="disabled" /> :disabled="disabled"
<li />
v-if="showCount" <li v-if="showCount" class="board-list-count text-center" data-issue-id="-1">
class="board-list-count text-center" <gl-loading-icon v-show="list.loadingMore" label="Loading more issues" />
data-issue-id="-1"> <span v-if="list.issues.length === list.issuesSize"> Showing all issues </span>
<gl-loading-icon <span v-else> Showing {{ list.issues.length }} of {{ list.issuesSize }} issues </span>
v-show="list.loadingMore"
label="Loading more issues"
/>
<span
v-if="list.issues.length === list.issuesSize"
>
Showing all issues
</span>
<span
v-else
>
Showing {{ list.issues.length }} of {{ list.issuesSize }} issues
</span>
</li> </li>
</ul> </ul>
</div> </div>
Loading
Loading
Loading
@@ -96,21 +96,11 @@ export default {
Loading
@@ -96,21 +96,11 @@ export default {
<template> <template>
<div class="board-new-issue-form"> <div class="board-new-issue-form">
<div class="board-card"> <div class="board-card">
<form @submit="submit($event)"> <form @submit="submit($event);">
<div <div v-if="error" class="flash-container">
v-if="error" <div class="flash-alert">An error occurred. Please try again.</div>
class="flash-container"
>
<div class="flash-alert">
An error occurred. Please try again.
</div>
</div> </div>
<label <label :for="list.id + '-title'" class="label-bold"> Title </label>
:for="list.id + '-title'"
class="label-bold"
>
Title
</label>
<input <input
:id="list.id + '-title'" :id="list.id + '-title'"
ref="input" ref="input"
Loading
@@ -120,10 +110,7 @@ export default {
Loading
@@ -120,10 +110,7 @@ export default {
name="issue_title" name="issue_title"
autocomplete="off" autocomplete="off"
/> />
<project-select <project-select v-if="groupId" :group-id="groupId" />
v-if="groupId"
:group-id="groupId"
/>
<div class="clearfix prepend-top-10"> <div class="clearfix prepend-top-10">
<gl-button <gl-button
ref="submit-button" ref="submit-button"
Loading
@@ -134,12 +121,7 @@ export default {
Loading
@@ -134,12 +121,7 @@ export default {
> >
Submit issue Submit issue
</gl-button> </gl-button>
<gl-button <gl-button class="float-right" type="button" variant="default" @click="cancel">
class="float-right"
type="button"
variant="default"
@click="cancel"
>
Cancel Cancel
</gl-button> </gl-button>
</div> </div>
Loading
Loading
Loading
@@ -169,17 +169,12 @@ export default {
Loading
@@ -169,17 +169,12 @@ export default {
:title="__('Confidential')" :title="__('Confidential')"
class="confidential-icon append-right-4" class="confidential-icon append-right-4"
:aria-label="__('Confidential')" :aria-label="__('Confidential')"
/><a /><a :href="issue.path" :title="issue.title" class="js-no-trigger" @mousemove.stop>{{
:href="issue.path" issue.title
:title="issue.title" }}</a>
class="js-no-trigger"
@mousemove.stop>{{ issue.title }}</a>
</h4> </h4>
</div> </div>
<div <div v-if="showLabelFooter" class="board-card-labels prepend-top-4 d-flex flex-wrap">
v-if="showLabelFooter"
class="board-card-labels prepend-top-4 d-flex flex-wrap"
>
<button <button
v-for="label in issue.labels" v-for="label in issue.labels"
v-if="showLabel(label)" v-if="showLabel(label)"
Loading
@@ -189,13 +184,15 @@ export default {
Loading
@@ -189,13 +184,15 @@ export default {
:title="label.description" :title="label.description"
class="badge color-label append-right-4 prepend-top-4" class="badge color-label append-right-4 prepend-top-4"
type="button" type="button"
@click="filterByLabel(label)" @click="filterByLabel(label);"
> >
{{ label.title }} {{ label.title }}
</button> </button>
</div> </div>
<div class="board-card-footer d-flex justify-content-between align-items-end"> <div class="board-card-footer d-flex justify-content-between align-items-end">
<div class="d-flex align-items-start flex-wrap-reverse board-card-number-container js-board-card-number-container"> <div
class="d-flex align-items-start flex-wrap-reverse board-card-number-container js-board-card-number-container"
>
<span <span
v-if="issue.referencePath" v-if="issue.referencePath"
class="board-card-number d-flex append-right-8 prepend-top-8" class="board-card-number d-flex append-right-8 prepend-top-8"
Loading
@@ -205,13 +202,11 @@ export default {
Loading
@@ -205,13 +202,11 @@ export default {
:title="issueReferencePath" :title="issueReferencePath"
placement="bottom" placement="bottom"
class="board-issue-path block-truncated bold" class="board-issue-path block-truncated bold"
>{{ issueReferencePath }}</tooltip-on-truncate>#{{ issue.iid }} >{{ issueReferencePath }}</tooltip-on-truncate
>#{{ issue.iid }}
</span> </span>
<span class="board-info-items prepend-top-8 d-inline-block"> <span class="board-info-items prepend-top-8 d-inline-block">
<issue-due-date <issue-due-date v-if="issue.dueDate" :date="issue.dueDate" /><issue-time-estimate
v-if="issue.dueDate"
:date="issue.dueDate"
/><issue-time-estimate
v-if="issue.timeEstimate" v-if="issue.timeEstimate"
:estimate="issue.timeEstimate" :estimate="issue.timeEstimate"
/> />
Loading
@@ -230,8 +225,7 @@ export default {
Loading
@@ -230,8 +225,7 @@ export default {
tooltip-placement="bottom" tooltip-placement="bottom"
> >
<span class="js-assignee-tooltip"> <span class="js-assignee-tooltip">
<span class="bold d-block">Assignee</span> <span class="bold d-block">Assignee</span> {{ assignee.name }}
{{ assignee.name }}
<span class="text-white-50">@{{ assignee.username }}</span> <span class="text-white-50">@{{ assignee.username }}</span>
</span> </span>
</user-avatar-link> </user-avatar-link>
Loading
Loading
Loading
@@ -66,25 +66,17 @@ export default {
Loading
@@ -66,25 +66,17 @@ export default {
   
<template> <template>
<span> <span>
<span <span ref="issueDueDate" class="board-card-info card-number">
ref="issueDueDate"
class="board-card-info card-number"
>
<icon <icon
:class="{'text-danger': isPastDue, 'board-card-info-icon': true}" :class="{ 'text-danger': isPastDue, 'board-card-info-icon': true }"
name="calendar" name="calendar"
/><time /><time :class="{ 'text-danger': isPastDue }" datetime="date" class="board-card-info-text">{{
:class="{'text-danger': isPastDue}" body
datetime="date" }}</time>
class="board-card-info-text">{{ body }}</time>
</span> </span>
<gl-tooltip <gl-tooltip :target="() => $refs.issueDueDate" placement="bottom">
:target="() => $refs.issueDueDate" <span class="bold">{{ __('Due date') }}</span> <br />
placement="bottom" <span :class="{ 'text-danger-muted': isPastDue }">{{ title }}</span>
>
<span class="bold">{{ __('Due date') }}</span>
<br />
<span :class="{'text-danger-muted': isPastDue}">{{ title }}</span>
</gl-tooltip> </gl-tooltip>
</span> </span>
</template> </template>
Loading
@@ -27,22 +27,18 @@ export default {
Loading
@@ -27,22 +27,18 @@ export default {
   
<template> <template>
<span> <span>
<span <span ref="issueTimeEstimate" class="board-card-info card-number">
ref="issueTimeEstimate" <icon name="hourglass" css-classes="board-card-info-icon" /><time
class="board-card-info card-number" class="board-card-info-text"
> >{{ timeEstimate }}</time
<icon >
name="hourglass"
css-classes="board-card-info-icon"
/><time class="board-card-info-text">{{ timeEstimate }}</time>
</span> </span>
<gl-tooltip <gl-tooltip
:target="() => $refs.issueTimeEstimate" :target="() => $refs.issueTimeEstimate"
placement="bottom" placement="bottom"
class="js-issue-time-estimate" class="js-issue-time-estimate"
> >
<span class="bold d-block">{{ __('Time estimate') }}</span> <span class="bold d-block">{{ __('Time estimate') }}</span> {{ title }}
{{ title }}
</gl-tooltip> </gl-tooltip>
</span> </span>
</template> </template>
Loading
@@ -45,24 +45,20 @@ export default {
Loading
@@ -45,24 +45,20 @@ export default {
<section class="empty-state"> <section class="empty-state">
<div class="row"> <div class="row">
<div class="col-12 col-md-6 order-md-last"> <div class="col-12 col-md-6 order-md-last">
<aside class="svg-content"><img :src="emptyStateSvg"/></aside> <aside class="svg-content"><img :src="emptyStateSvg" /></aside>
</div> </div>
<div class="col-12 col-md-6 order-md-first"> <div class="col-12 col-md-6 order-md-first">
<div class="text-content"> <div class="text-content">
<h4>{{ contents.title }}</h4> <h4>{{ contents.title }}</h4>
<p v-html="contents.content"></p> <p v-html="contents.content"></p>
<a <a v-if="activeTab === 'all'" :href="newIssuePath" class="btn btn-success btn-inverted">
v-if="activeTab === 'all'"
:href="newIssuePath"
class="btn btn-success btn-inverted"
>
New issue New issue
</a> </a>
<button <button
v-if="activeTab === 'selected'" v-if="activeTab === 'selected'"
class="btn btn-default" class="btn btn-default"
type="button" type="button"
@click="changeTab('all')" @click="changeTab('all');"
> >
Open issues Open issues
</button> </button>
Loading
Loading
Loading
@@ -63,28 +63,15 @@ export default {
Loading
@@ -63,28 +63,15 @@ export default {
}; };
</script> </script>
<template> <template>
<footer <footer class="form-actions add-issues-footer">
class="form-actions add-issues-footer"
>
<div class="float-left"> <div class="float-left">
<button <button :disabled="submitDisabled" class="btn btn-success" type="button" @click="addIssues">
:disabled="submitDisabled"
class="btn btn-success"
type="button"
@click="addIssues"
>
{{ submitText }} {{ submitText }}
</button> </button>
<span class="inline add-issues-footer-to-list"> <span class="inline add-issues-footer-to-list"> to list </span>
to list <lists-dropdown />
</span>
<lists-dropdown/>
</div> </div>
<button <button class="btn btn-default float-right" type="button" @click="toggleModal(false);">
class="btn btn-default float-right"
type="button"
@click="toggleModal(false)"
>
Cancel Cancel
</button> </button>
</footer> </footer>
Loading
Loading
Loading
@@ -58,16 +58,14 @@ export default {
Loading
@@ -58,16 +58,14 @@ export default {
class="close" class="close"
data-dismiss="modal" data-dismiss="modal"
aria-label="Close" aria-label="Close"
@click="toggleModal(false)" @click="toggleModal(false);"
> >
<span aria-hidden="true">×</span> <span aria-hidden="true">×</span>
</button> </button>
</h2> </h2>
</header> </header>
<modal-tabs v-if="!loading && issuesCount > 0"/> <modal-tabs v-if="!loading && issuesCount > 0" />
<div <div v-if="showSearch" class="add-issues-search append-bottom-10">
v-if="showSearch"
class="add-issues-search append-bottom-10">
<modal-filters :store="filter" /> <modal-filters :store="filter" />
<button <button
ref="selectAllBtn" ref="selectAllBtn"
Loading
Loading
Loading
@@ -143,9 +143,7 @@ export default {
Loading
@@ -143,9 +143,7 @@ export default {
}; };
</script> </script>
<template> <template>
<div <div v-if="showAddIssuesModal" class="add-issues-modal">
v-if="showAddIssuesModal"
class="add-issues-modal">
<div class="add-issues-container"> <div class="add-issues-container">
<modal-header <modal-header
:project-id="projectId" :project-id="projectId"
Loading
@@ -163,15 +161,10 @@ export default {
Loading
@@ -163,15 +161,10 @@ export default {
:new-issue-path="newIssuePath" :new-issue-path="newIssuePath"
:empty-state-svg="emptyStateSvg" :empty-state-svg="emptyStateSvg"
/> />
<section <section v-if="loading || filterLoading" class="add-issues-list text-center">
v-if="loading || filterLoading" <div class="add-issues-list-loading"><gl-loading-icon /></div>
class="add-issues-list text-center"
>
<div class="add-issues-list-loading">
<gl-loading-icon />
</div>
</section> </section>
<modal-footer/> <modal-footer />
</div> </div>
</div> </div>
</template> </template>
Loading
@@ -117,38 +117,22 @@ export default {
Loading
@@ -117,38 +117,22 @@ export default {
}; };
</script> </script>
<template> <template>
<section <section ref="list" class="add-issues-list add-issues-list-columns">
ref="list"
class="add-issues-list add-issues-list-columns">
<div <div
v-if="issuesCount > 0 && issues.length === 0" v-if="issuesCount > 0 && issues.length === 0"
class="empty-state add-issues-empty-state-filter text-center"> class="empty-state add-issues-empty-state-filter text-center"
<div class="svg-content"> >
<img :src="emptyStateSvg" /> <div class="svg-content"><img :src="emptyStateSvg" /></div>
</div> <div class="text-content"><h4>There are no issues to show.</h4></div>
<div class="text-content">
<h4>
There are no issues to show.
</h4>
</div>
</div> </div>
<div <div v-for="(group, index) in groupedIssues" :key="index" class="add-issues-list-column">
v-for="(group, index) in groupedIssues" <div v-for="issue in group" v-if="showIssue(issue)" :key="issue.id" class="board-card-parent">
:key="index"
class="add-issues-list-column">
<div
v-for="issue in group"
v-if="showIssue(issue)"
:key="issue.id"
class="board-card-parent">
<div <div
:class="{ 'is-active': issue.selected }" :class="{ 'is-active': issue.selected }"
class="board-card" class="board-card"
@click="toggleIssue($event, issue)"> @click="toggleIssue($event, issue);"
<issue-card-inner >
:issue="issue" <issue-card-inner :issue="issue" :issue-link-base="issueLinkBase" :root-path="rootPath" />
:issue-link-base="issueLinkBase"
:root-path="rootPath"/>
<icon <icon
v-if="issue.selected" v-if="issue.selected"
:aria-label="'Issue #' + issue.id + ' selected'" :aria-label="'Issue #' + issue.id + ' selected'"
Loading
Loading
Loading
@@ -27,35 +27,20 @@ export default {
Loading
@@ -27,35 +27,20 @@ export default {
</script> </script>
<template> <template>
<div class="dropdown inline"> <div class="dropdown inline">
<button <button class="dropdown-menu-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
class="dropdown-menu-toggle" <span :style="{ backgroundColor: selected.label.color }" class="dropdown-label-box"> </span>
type="button" {{ selected.title }} <icon name="chevron-down" />
data-toggle="dropdown"
aria-expanded="false">
<span
:style="{ backgroundColor: selected.label.color }"
class="dropdown-label-box">
</span>
{{ selected.title }}
<icon
name="chevron-down"
/>
</button> </button>
<div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"> <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up">
<ul> <ul>
<li <li v-for="(list, i) in state.lists" v-if="list.type == 'label'" :key="i">
v-for="(list, i) in state.lists"
v-if="list.type == 'label'"
:key="i">
<gl-link <gl-link
:class="{ 'is-active': list.id == selected.id }" :class="{ 'is-active': list.id == selected.id }"
href="#" href="#"
role="button" role="button"
@click.prevent="modal.selectedList = list"> @click.prevent="modal.selectedList = list;"
<span >
:style="{ backgroundColor: list.label.color }" <span :style="{ backgroundColor: list.label.color }" class="dropdown-label-box"> </span>
class="dropdown-label-box">
</span>
{{ list.title }} {{ list.title }}
</gl-link> </gl-link>
</li> </li>
Loading
Loading
Loading
@@ -20,28 +20,14 @@ export default {
Loading
@@ -20,28 +20,14 @@ export default {
<template> <template>
<div class="top-area prepend-top-10 append-bottom-10"> <div class="top-area prepend-top-10 append-bottom-10">
<ul class="nav-links issues-state-filters"> <ul class="nav-links issues-state-filters">
<li :class="{ 'active': activeTab == 'all' }"> <li :class="{ active: activeTab == 'all' }">
<a <a href="#" role="button" @click.prevent="changeTab('all');">
href="#" Open issues <span class="badge badge-pill"> {{ issuesCount }} </span>
role="button"
@click.prevent="changeTab('all')"
>
Open issues
<span class="badge badge-pill">
{{ issuesCount }}
</span>
</a> </a>
</li> </li>
<li :class="{ 'active': activeTab == 'selected' }"> <li :class="{ active: activeTab == 'selected' }">
<a <a href="#" role="button" @click.prevent="changeTab('selected');">
href="#" Selected issues <span class="badge badge-pill"> {{ selectedCount }} </span>
role="button"
@click.prevent="changeTab('selected')"
>
Selected issues
<span class="badge badge-pill">
{{ selectedCount }}
</span>
</a> </a>
</li> </li>
</ul> </ul>
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