Refactor to follow @alina-beck suggestions

- Update CSS
- Use design tokens where possible
- Update spec description
- Avoid scoped scss as it's more expensive
- did not change the next and back button as they weren't really visible
without the primary class
- Fix German translation
This commit is contained in:
mattwr18 2019-10-30 15:34:17 +01:00
parent 44ed462db2
commit 7564908456
6 changed files with 14 additions and 22 deletions

View File

@ -76,7 +76,7 @@ describe('AvatarMenu.vue', () => {
}) })
}) })
describe('routes', () => { describe('menu items', () => {
beforeEach(() => { beforeEach(() => {
getters = { getters = {
'auth/user': () => { 'auth/user': () => {

View File

@ -118,9 +118,9 @@ export default {
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.avatar-menu { .avatar-menu {
margin: 2px 0px 0px 5px; margin: $space-xxx-small 0px 0px $space-xx-small;
} }
.avatar-menu-trigger { .avatar-menu-trigger {
user-select: none; user-select: none;
@ -129,21 +129,15 @@ export default {
padding-left: $space-xx-small; padding-left: $space-xx-small;
} }
.avatar-menu-popover { .avatar-menu-popover {
padding-top: 0.5rem; padding-top: $space-x-small;
padding-bottom: 0.5rem; padding-bottom: $space-x-small;
hr { hr {
color: $color-neutral-90; color: $color-neutral-90;
background-color: $color-neutral-90; background-color: $color-neutral-90;
} }
.logout-link { .logout-link {
margin-left: -$space-small;
margin-right: -$space-small;
margin-top: -$space-xxx-small;
margin-bottom: -$space-x-small;
padding: $space-x-small $space-small;
// subtract menu border with from padding
padding-left: $space-small - 2;
color: $text-color-base; color: $text-color-base;
padding-top: $space-xx-small;
&:hover { &:hover {
color: $text-color-link-active; color: $text-color-link-active;
} }

View File

@ -69,10 +69,9 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.notification.read { .notification.read {
opacity: 0.6; /* Real browsers */ opacity: $opacity-soft;
filter: alpha(opacity = 60); /* MSIE */
} }
.notifications-card { .notifications-card {
min-width: 500px; min-width: 500px;

View File

@ -105,7 +105,6 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.notification-status { .notification-status {
opacity: 0.6; /* Real browsers */ opacity: $opacity-soft;
filter: alpha(opacity = 60); /* MSIE */
} }
</style> </style>

View File

@ -183,7 +183,7 @@
"content": "Inhalt", "content": "Inhalt",
"filterLabel": { "filterLabel": {
"all": "Alle", "all": "Alle",
"read": "Lesen ", "read": "Gelesen ",
"unread": "Ungelesen" "unread": "Ungelesen"
}, },
"empty": "Sorry, du hast im Moment keine Benachrichtigungen." "empty": "Sorry, du hast im Moment keine Benachrichtigungen."

View File

@ -1,10 +1,10 @@
<template> <template>
<ds-card space="small"> <ds-card space="small">
<ds-flex> <ds-flex class="notifications-page-flex">
<ds-flex-item :width="{ lg: '85%' }"> <ds-flex-item :width="{ lg: '85%' }">
<ds-heading tag="h3">{{ $t('notifications.title') }}</ds-heading> <ds-heading tag="h3">{{ $t('notifications.title') }}</ds-heading>
</ds-flex-item> </ds-flex-item>
<ds-flex-item class="sorting-dropdown"> <ds-flex-item width="100px">
<client-only> <client-only>
<notifications-dropdown-filter @filterNotifications="filterNotifications" /> <notifications-dropdown-filter @filterNotifications="filterNotifications" />
</client-only> </client-only>
@ -100,7 +100,7 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.sorting-dropdown { .notifications-page-flex {
float: right; justify-content: space-between;
} }
</style> </style>