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

Fix icon-contacts-dark #2340

Merged
merged 1 commit into from
Jul 8, 2021
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
10 changes: 9 additions & 1 deletion css/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,15 @@
@include icon-black-white('sync', 'contacts', 2);
@include icon-black-white('recent-actors', 'contacts', 1);
@include icon-black-white('circles', 'contacts', 1);
@include icon-black-white('contacts', 'contacts', 1);

.icon-contacts {
&-dark {
@include icon-color('contacts', 'contacts', $color-black);
}
&-white {
@include icon-color('contacts', 'contacts', $color-white);
}
}

// social network icons:
@include icon-black-white('facebook', 'contacts', 2); // “facebook (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/facebook?style=brands)
Expand Down
4 changes: 2 additions & 2 deletions src/components/ContactDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<template>
<AppContentDetails>
<!-- nothing selected or contact not found -->
<EmptyContent v-if="!contact" icon="icon-contacts">
<EmptyContent v-if="!contact" icon="icon-contacts-dark">
{{ t('contacts', 'No contact selected') }}
<template #desc>
{{ t('contacts', 'Select a contact on the list to begin') }}
Expand Down Expand Up @@ -423,7 +423,7 @@ export default {
groupsModel() {
return {
readableName: t('contacts', 'Groups'),
icon: 'icon-contacts',
icon: 'icon-contacts-dark',
}
},

Expand Down
4 changes: 2 additions & 2 deletions src/components/MemberList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
{{ t('contacts', 'Loading members list …') }}
</EmptyContent>

<EmptyContent v-else-if="!circle.isMember" icon="icon-contacts">
<EmptyContent v-else-if="!circle.isMember" icon="icon-contacts-dark">
{{ t('contacts', 'The list of members is only visible to members of this circle') }}
</EmptyContent>

<EmptyContent v-else icon="icon-contacts">
<EmptyContent v-else icon="icon-contacts-dark">
{{ t('contacts', 'There is no member in this circle') }}
</EmptyContent>
</AppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Properties/PropertyGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<template>
<div v-if="propModel" class="property property--without-actions">
<PropertyTitle
icon="icon-contacts"
icon="icon-contacts-dark"
:readable-name="t('contacts', 'Groups')" />

<div class="property__row">
Expand Down
2 changes: 1 addition & 1 deletion src/files-action.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ window.addEventListener('DOMContentLoaded', () => {
displayName: t('contacts', 'Import'),
mime,
permissions: OC.PERMISSION_READ,
iconClass: 'icon-contacts',
iconClass: 'icon-contacts-dark',
actionHandler(fileName, context) {
const absPath = `${context.dir === '/' ? '' : context.dir}/${fileName}`
window.location = generateUrl(`/apps/contacts/import?file=${absPath}`)
Expand Down
2 changes: 1 addition & 1 deletion templates/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
?>
<div id="app-content">
<div class="emptycontent">
<div class="icon-contacts"></div>
<div class="icon-contacts-dark"></div>
<h2><?php p($l->t('Your web browser is out of date')); ?></h2>
<p><?php p($l->t('This application is not compatible with Internet Explorer')); ?></p>
</div>
Expand Down