Skip to content

Enable checkboxes by default and improve UX #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Apr 14, 2022
Merged

Enable checkboxes by default and improve UX #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7019a4f
Improve loading UI and enable checkboxes by default
Pytal Apr 13, 2022
50ccd19
Add close button to completed modal
Pytal Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add close button to completed modal 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Apr 13, 2022
commit 50ccd19c2be3d0a276022790a293a6ff845a85ac
4 changes: 2 additions & 2 deletions js/user_migration-personal-settings.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/user_migration-personal-settings.js.map
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 17 additions & 6 deletions src/components/ExportSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,17 @@
</EmptyContent>
<div v-if="status.status === 'waiting' || status.status === 'started'"
class="section__icon icon-loading" />
<CheckCircleOutline v-else
class="section__icon"
title=""
:size="40" />
<template v-else>
<CheckCircleOutline class="section__icon"
title=""
:size="40" />
<Button class="section__close"
type="secondary"
:aria-label="t('user_migration', 'Close export status')"
@click.stop.prevent="closeModal">
{{ t('user_migration', 'Close') }}
</Button>
</template>
</div>
</Modal>
</template>
Expand Down Expand Up @@ -225,15 +232,19 @@ export default {
}

.section__modal {
margin: 110px auto;
margin: 80px auto 60px auto;

&::v-deep .empty-content {
margin-top: 0;
}

.section__icon {
height: 40px;
margin-top: 20px;
margin: 20px 0;
}

.section__close {
margin: 40px auto 0 auto;
}
}
</style>
23 changes: 17 additions & 6 deletions src/components/ImportSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,17 @@
</EmptyContent>
<div v-if="status.status === 'waiting' || status.status === 'started'"
class="section__icon icon-loading" />
<CheckCircleOutline v-else
class="section__icon"
title=""
:size="40" />
<template v-else>
<CheckCircleOutline class="section__icon"
title=""
:size="40" />
<Button class="section__close"
type="secondary"
:aria-label="t('user_migration', 'Close import status')"
@click.stop.prevent="closeModal">
{{ t('user_migration', 'Close') }}
</Button>
</template>
</div>
</Modal>
</template>
Expand Down Expand Up @@ -205,15 +212,19 @@ export default {
}

.section__modal {
margin: 110px auto;
margin: 80px auto 60px auto;

&::v-deep .empty-content {
margin-top: 0;
}

.section__icon {
height: 40px;
margin-top: 20px;
margin: 20px 0;
}

.section__close {
margin: 40px auto 0 auto;
}
}
</style>