Skip to content

Commit

Permalink
Merge pull request #33242 from nextcloud/enh/email-material-icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Pytal authored Jul 21, 2022
2 parents de08b53 + ecdde8d commit ea73f66
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
19 changes: 6 additions & 13 deletions apps/settings/src/components/PersonalInfo/EmailSection/Email.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

<div class="email__actions-container">
<transition name="fade">
<span v-if="showCheckmarkIcon" class="icon-checkmark" />
<span v-else-if="showErrorIcon" class="icon-error" />
<Check v-if="showCheckmarkIcon" :size="20" />
<AlertOctagon v-else-if="showErrorIcon" :size="20" />
</transition>

<template v-if="!primary">
Expand Down Expand Up @@ -80,6 +80,8 @@
<script>
import Actions from '@nextcloud/vue/dist/Components/Actions'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import AlertOctagon from 'vue-material-design-icons/AlertOctagon'
import Check from 'vue-material-design-icons/Check'
import { showError } from '@nextcloud/dialogs'
import debounce from 'debounce'

Expand All @@ -103,6 +105,8 @@ export default {
components: {
Actions,
ActionButton,
AlertOctagon,
Check,
FederationControl,
},

Expand Down Expand Up @@ -397,17 +401,6 @@ export default {
min-width: 30px !important;
}
}

.icon-checkmark,
.icon-error {
height: 30px !important;
min-height: 30px !important;
width: 30px !important;
min-width: 30px !important;
top: 0;
right: 0;
float: none;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-personal-info.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-personal-info.js.map

Large diffs are not rendered by default.

0 comments on commit ea73f66

Please sign in to comment.