diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-11-16 23:07:38 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-11-20 18:30:01 +0300 |
commit | 5b9495c5db851ec8d1ca2cc6da0da12d6b161130 (patch) | |
tree | f622611ceb4caeda70212a52438a2c9428511a68 /app/assets/javascripts/boards/components/modal | |
parent | 29d129d21718f8aa9c7d58a8b403cf91f6d4addd (diff) |
Prettify all the things
Diffstat (limited to 'app/assets/javascripts/boards/components/modal')
7 files changed, 38 insertions, 109 deletions
diff --git a/app/assets/javascripts/boards/components/modal/empty_state.vue b/app/assets/javascripts/boards/components/modal/empty_state.vue index 795ba864545..08408eb0b52 100644 --- a/app/assets/javascripts/boards/components/modal/empty_state.vue +++ b/app/assets/javascripts/boards/components/modal/empty_state.vue @@ -45,24 +45,20 @@ export default { <section class="empty-state"> <div class="row"> <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 class="col-12 col-md-6 order-md-first"> <div class="text-content"> <h4>{{ contents.title }}</h4> <p v-html="contents.content"></p> - <a - v-if="activeTab === 'all'" - :href="newIssuePath" - class="btn btn-success btn-inverted" - > + <a v-if="activeTab === 'all'" :href="newIssuePath" class="btn btn-success btn-inverted"> New issue </a> <button v-if="activeTab === 'selected'" class="btn btn-default" type="button" - @click="changeTab('all')" + @click="changeTab('all');" > Open issues </button> diff --git a/app/assets/javascripts/boards/components/modal/footer.vue b/app/assets/javascripts/boards/components/modal/footer.vue index d51597ed22d..b1bc7d87086 100644 --- a/app/assets/javascripts/boards/components/modal/footer.vue +++ b/app/assets/javascripts/boards/components/modal/footer.vue @@ -63,28 +63,15 @@ export default { }; </script> <template> - <footer - class="form-actions add-issues-footer" - > + <footer class="form-actions add-issues-footer"> <div class="float-left"> - <button - :disabled="submitDisabled" - class="btn btn-success" - type="button" - @click="addIssues" - > + <button :disabled="submitDisabled" class="btn btn-success" type="button" @click="addIssues"> {{ submitText }} </button> - <span class="inline add-issues-footer-to-list"> - to list - </span> - <lists-dropdown/> + <span class="inline add-issues-footer-to-list"> to list </span> + <lists-dropdown /> </div> - <button - class="btn btn-default float-right" - type="button" - @click="toggleModal(false)" - > + <button class="btn btn-default float-right" type="button" @click="toggleModal(false);"> Cancel </button> </footer> diff --git a/app/assets/javascripts/boards/components/modal/header.vue b/app/assets/javascripts/boards/components/modal/header.vue index fc6cefa89a9..d0e285a149e 100644 --- a/app/assets/javascripts/boards/components/modal/header.vue +++ b/app/assets/javascripts/boards/components/modal/header.vue @@ -58,16 +58,14 @@ export default { class="close" data-dismiss="modal" aria-label="Close" - @click="toggleModal(false)" + @click="toggleModal(false);" > <span aria-hidden="true">×</span> </button> </h2> </header> - <modal-tabs v-if="!loading && issuesCount > 0"/> - <div - v-if="showSearch" - class="add-issues-search append-bottom-10"> + <modal-tabs v-if="!loading && issuesCount > 0" /> + <div v-if="showSearch" class="add-issues-search append-bottom-10"> <modal-filters :store="filter" /> <button ref="selectAllBtn" diff --git a/app/assets/javascripts/boards/components/modal/index.vue b/app/assets/javascripts/boards/components/modal/index.vue index fc0e3e46b88..1e5761cf268 100644 --- a/app/assets/javascripts/boards/components/modal/index.vue +++ b/app/assets/javascripts/boards/components/modal/index.vue @@ -143,9 +143,7 @@ export default { }; </script> <template> - <div - v-if="showAddIssuesModal" - class="add-issues-modal"> + <div v-if="showAddIssuesModal" class="add-issues-modal"> <div class="add-issues-container"> <modal-header :project-id="projectId" @@ -163,15 +161,10 @@ export default { :new-issue-path="newIssuePath" :empty-state-svg="emptyStateSvg" /> - <section - v-if="loading || filterLoading" - class="add-issues-list text-center" - > - <div class="add-issues-list-loading"> - <gl-loading-icon /> - </div> + <section v-if="loading || filterLoading" class="add-issues-list text-center"> + <div class="add-issues-list-loading"><gl-loading-icon /></div> </section> - <modal-footer/> + <modal-footer /> </div> </div> </template> diff --git a/app/assets/javascripts/boards/components/modal/list.vue b/app/assets/javascripts/boards/components/modal/list.vue index e11f398e70d..878bb002c6c 100644 --- a/app/assets/javascripts/boards/components/modal/list.vue +++ b/app/assets/javascripts/boards/components/modal/list.vue @@ -117,38 +117,22 @@ export default { }; </script> <template> - <section - ref="list" - class="add-issues-list add-issues-list-columns"> + <section ref="list" class="add-issues-list add-issues-list-columns"> <div v-if="issuesCount > 0 && issues.length === 0" - class="empty-state add-issues-empty-state-filter text-center"> - <div class="svg-content"> - <img :src="emptyStateSvg" /> - </div> - <div class="text-content"> - <h4> - There are no issues to show. - </h4> - </div> + class="empty-state add-issues-empty-state-filter text-center" + > + <div class="svg-content"><img :src="emptyStateSvg" /></div> + <div class="text-content"><h4>There are no issues to show.</h4></div> </div> - <div - v-for="(group, index) in groupedIssues" - :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 v-for="(group, index) in groupedIssues" :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 :class="{ 'is-active': issue.selected }" class="board-card" - @click="toggleIssue($event, issue)"> - <issue-card-inner - :issue="issue" - :issue-link-base="issueLinkBase" - :root-path="rootPath"/> + @click="toggleIssue($event, issue);" + > + <issue-card-inner :issue="issue" :issue-link-base="issueLinkBase" :root-path="rootPath" /> <icon v-if="issue.selected" :aria-label="'Issue #' + issue.id + ' selected'" diff --git a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue index c502e32d169..820d0679df5 100644 --- a/app/assets/javascripts/boards/components/modal/lists_dropdown.vue +++ b/app/assets/javascripts/boards/components/modal/lists_dropdown.vue @@ -27,35 +27,20 @@ export default { </script> <template> <div class="dropdown inline"> - <button - class="dropdown-menu-toggle" - type="button" - data-toggle="dropdown" - aria-expanded="false"> - <span - :style="{ backgroundColor: selected.label.color }" - class="dropdown-label-box"> - </span> - {{ selected.title }} - <icon - name="chevron-down" - /> + <button class="dropdown-menu-toggle" type="button" data-toggle="dropdown" aria-expanded="false"> + <span :style="{ backgroundColor: selected.label.color }" class="dropdown-label-box"> </span> + {{ selected.title }} <icon name="chevron-down" /> </button> <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"> <ul> - <li - v-for="(list, i) in state.lists" - v-if="list.type == 'label'" - :key="i"> + <li v-for="(list, i) in state.lists" v-if="list.type == 'label'" :key="i"> <gl-link :class="{ 'is-active': list.id == selected.id }" href="#" role="button" - @click.prevent="modal.selectedList = list"> - <span - :style="{ backgroundColor: list.label.color }" - class="dropdown-label-box"> - </span> + @click.prevent="modal.selectedList = list;" + > + <span :style="{ backgroundColor: list.label.color }" class="dropdown-label-box"> </span> {{ list.title }} </gl-link> </li> diff --git a/app/assets/javascripts/boards/components/modal/tabs.vue b/app/assets/javascripts/boards/components/modal/tabs.vue index 5d661590e8e..7b800a6ab97 100644 --- a/app/assets/javascripts/boards/components/modal/tabs.vue +++ b/app/assets/javascripts/boards/components/modal/tabs.vue @@ -20,28 +20,14 @@ export default { <template> <div class="top-area prepend-top-10 append-bottom-10"> <ul class="nav-links issues-state-filters"> - <li :class="{ 'active': activeTab == 'all' }"> - <a - href="#" - role="button" - @click.prevent="changeTab('all')" - > - Open issues - <span class="badge badge-pill"> - {{ issuesCount }} - </span> + <li :class="{ active: activeTab == 'all' }"> + <a href="#" role="button" @click.prevent="changeTab('all');"> + Open issues <span class="badge badge-pill"> {{ issuesCount }} </span> </a> </li> - <li :class="{ 'active': activeTab == 'selected' }"> - <a - href="#" - role="button" - @click.prevent="changeTab('selected')" - > - Selected issues - <span class="badge badge-pill"> - {{ selectedCount }} - </span> + <li :class="{ active: activeTab == 'selected' }"> + <a href="#" role="button" @click.prevent="changeTab('selected');"> + Selected issues <span class="badge badge-pill"> {{ selectedCount }} </span> </a> </li> </ul> |