Skip to content
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.

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

Migrate icons to material design #6872

Merged
merged 1 commit into from
Jul 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/components/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@
</DashboardWidgetItem>
</template>
<template #empty-content>
<EmptyContent id="mail--empty-content" icon="icon-checkmark">
<EmptyContent id="mail--empty-content">
<template #icon>
<IconCheck :size="65" />
</template>
<template #desc>
{{ t('mail', 'No message found yet') }}
<div class="no-account">
Expand All @@ -61,6 +64,7 @@ import { DashboardWidget, DashboardWidgetItem } from '@nextcloud/vue-dashboard'
import orderBy from 'lodash/fp/orderBy'
import prop from 'lodash/fp/prop'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
import IconCheck from 'vue-material-design-icons/Check'

import Avatar from '../components/Avatar'
import { fetchEnvelopes } from '../service/MessageService'
Expand All @@ -77,6 +81,7 @@ export default {
DashboardWidget,
DashboardWidgetItem,
EmptyContent,
IconCheck,
},
props: {
query: {
Expand Down
6 changes: 5 additions & 1 deletion src/components/EmptyMailbox.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<template>
<div id="emptycontent">
<div class="icon-mail" />
<IconMail :size="65" />
<h2>{{ t('mail', 'No messages in this mailbox') }}</h2>
</div>
</template>

<script>
import IconMail from 'vue-material-design-icons/Email'
export default {
name: 'EmptyMailbox',
components: {
IconMail,
},
}
</script>
8 changes: 6 additions & 2 deletions src/components/NavigationAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
v-if="visible"
:id="id"
:key="id"
:icon="iconError"
:menu-open.sync="menuOpen"
:title="account.emailAddress"
:to="firstMailboxRoute"
:exact="true"
@update:menuOpen="onMenuToggle">
<template #icon>
<IconError v-if="account.error" :size="20" />
</template>
<!-- Color dot -->
<AppNavigationIconBullet v-if="bulletColor" slot="icon" :color="bulletColor" />

Expand Down Expand Up @@ -122,6 +124,7 @@ import IconFolderAdd from 'vue-material-design-icons/Folder'
import MenuDown from 'vue-material-design-icons/MenuDown'
import MenuUp from 'vue-material-design-icons/MenuUp'
import IconDelete from 'vue-material-design-icons/Delete'
import IconError from 'vue-material-design-icons/AlertCircle'

export default {
name: 'NavigationAccount',
Expand All @@ -139,6 +142,7 @@ export default {
MenuDown,
MenuUp,
IconDelete,
IconError,
},
props: {
account: {
Expand Down Expand Up @@ -194,7 +198,7 @@ export default {
return this.account.error ? undefined : calculateAccountColor(this.account.emailAddress)
},
iconError() {
return this.account.error ? 'icon-error' : undefined
return this.account.error
},
quotaText() {
if (this.quota === undefined) {
Expand Down
12 changes: 3 additions & 9 deletions src/components/NoMessageSelected.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<template>
<AppContentDetails>
<div id="emptycontent">
<div class="icon icon-mail" />
<IconMail :size="65" />
<h2>{{ t('mail', 'No message selected') }}</h2>
<p />
</div>
Expand All @@ -31,24 +31,18 @@

<script>
import AppContentDetails from '@nextcloud/vue/dist/Components/AppContentDetails'
import IconMail from 'vue-material-design-icons/Email'

export default {
name: 'NoMessageSelected',
components: {
AppContentDetails,
IconMail,
},
}
</script>

<style scoped>
.icon {
height: 64px;
width: 64px;
margin: 0 auto 15px;
background-size: 64px;
opacity: 0.4;
}

h2,
p {
text-align: center;
Expand Down
5 changes: 4 additions & 1 deletion src/components/OutboxMessageContent.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<template>
<div id="emptycontent">
<div class="icon-mail" />
<IconMail :size="65" />
<h2>{{ t('mail', 'Pending or not sent messages will show up here') }}</h2>
<div />
</div>
</template>

<script>
import IconMail from 'vue-material-design-icons/Email'

export default {
name: 'OutboxMessageContent',
components: {
IconMail,
},
}
</script>
Expand Down
7 changes: 6 additions & 1 deletion src/views/Setup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<Content app-name="mail">
<Navigation v-if="hasAccounts" />
<div class="mail-empty-content">
<EmptyContent icon="icon-mail">
<EmptyContent>
<template #icon>
<IconMail :size="65" />
</template>
<h2>{{ t('mail', 'Connect your mail account') }}</h2>
<template #desc>
<AccountForm :display-name="displayName"
Expand All @@ -21,6 +24,7 @@ import { loadState } from '@nextcloud/initial-state'

import AccountForm from '../components/AccountForm'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
import IconMail from 'vue-material-design-icons/Email'
import Navigation from '../components/Navigation'
import logger from '../logger'

Expand All @@ -30,6 +34,7 @@ export default {
AccountForm,
Content,
EmptyContent,
IconMail,
Navigation,
},
data() {
Expand Down