summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-10-25 08:51:38 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-10-25 08:51:38 +0200
commit6627127b0c3b1559cdd9d2915914163be7e1eddc (patch)
treebc5dcba03f0e904ba58970c19a40f2f0e5732dc6
parent98371eb2acf0ce2501ccbe91580e9f252b264b7e (diff)
Header icons fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--css/ContactDetails.scss18
-rw-r--r--src/components/ContactDetails.vue6
-rw-r--r--src/views/Contacts.vue2
3 files changed, 11 insertions, 15 deletions
diff --git a/css/ContactDetails.scss b/css/ContactDetails.scss
index a141c52a..52c1e6cc 100644
--- a/css/ContactDetails.scss
+++ b/css/ContactDetails.scss
@@ -71,22 +71,18 @@
position: relative;
height: 44px;
width: 44px;
+ }
+ .header-icon {
+ height: 44px;
+ width: 44px;
+ padding: 14px;
border-radius: 22px;
- &.menu-icon--pulse {
+ cursor: pointer;
+ &.header-icon--pulse {
margin: 8px;
width: 16px;
height: 16px;
}
-
- &[class^='icon-'],
- &[class*=' icon-'],
- > [class^='icon-'],
- > [class*=' icon-'] {
- height: 44px;
- width: 44px;
- padding: 14px;
- cursor: pointer;
- }
}
}
}
diff --git a/src/components/ContactDetails.vue b/src/components/ContactDetails.vue
index 049f44c1..1c5b161d 100644
--- a/src/components/ContactDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -67,15 +67,15 @@
<!-- actions -->
<div id="contact-header-actions">
- <div v-tooltip.bottom="warning" :class="{'icon-loading-small': loadingUpdate, 'menu-icon--pulse icon-error-white': warning}" class="menu-icon" />
+ <div v-tooltip.bottom="warning" :class="{'icon-loading-small': loadingUpdate, 'header-icon--pulse icon-error-white': warning}" class="header-icon" />
<div v-tooltip="{
content: conflict,
show: true,
trigger: 'manual',
- }" v-if="conflict" class="menu-icon menu-icon--pulse icon-history-white"
+ }" v-if="conflict" class="header-icon header-icon--pulse icon-history-white"
@click="refreshContact" />
<div class="menu-icon">
- <div v-click-outside="closeMenu" class="icon-more-white" @click="toggleMenu" />
+ <div v-click-outside="closeMenu" class="header-icon icon-more-white" @click="toggleMenu" />
<div :class="{ 'open': openedMenu }" class="popovermenu">
<popover-menu :menu="contactActions" />
</div>
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index 67a7fa39..7ce851bc 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -111,7 +111,7 @@ export default {
},
// first enabled addressbook of the list
defaultAddressbook() {
- return this.addressbooks.find(addressbook => addressbook.readOnly !== false)
+ return this.addressbooks.find(addressbook => !addressbook.readOnly)
},
/**