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

[stable26] Fix header menu color by updating @nextcloud/vue to 7.10.0 #1534

Merged
merged 5 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from 3 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
4 changes: 2 additions & 2 deletions js/notifications-admin-settings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-admin-settings.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/notifications-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-main.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/notifications-settings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-settings.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2,059 changes: 1,962 additions & 97 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/notify_push": "^1.1.3",
"@nextcloud/router": "^2.0.1",
"@nextcloud/vue": "^7.7.2",
"@nextcloud/vue": "^7.10.0",
"@nextcloud/vue-richtext": "^2.0.4",
"howler": "^2.2.3",
"v-click-outside": "^3.2.0",
Expand Down
10 changes: 3 additions & 7 deletions src/NotificationsApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class="notifications-button__icon"
:size="20"
:title="t('notifications', 'Notifications')"
fill-color="var(--color-primary-text)" />
fill="currentColor" />
nickvergessen marked this conversation as resolved.
Show resolved Hide resolved
<!-- From material design icons -->
<svg v-else
class="notifications-button__icon"
Expand All @@ -21,7 +21,7 @@
width="20"
height="20"
viewBox="0 0 24 24"
fill="var(--color-primary-text)">
fill="currentColor">
<path d="M 19,11.79 C 18.5,11.92 18,12 17.5,12 14.47,12 12,9.53 12,6.5 12,5.03 12.58,3.7 13.5,2.71 13.15,2.28 12.61,2 12,2 10.9,2 10,2.9 10,4 V 4.29 C 7.03,5.17 5,7.9 5,11 v 6 l -2,2 v 1 H 21 V 19 L 19,17 V 11.79 M 12,23 c 1.11,0 2,-0.89 2,-2 h -4 c 0,1.11 0.9,2 2,2 z" />
<path :class="isRedThemed ? 'notification__dot--white' : ''" class="notification__dot" d="M 21,6.5 C 21,8.43 19.43,10 17.5,10 15.57,10 14,8.43 14,6.5 14,4.57 15.57,3 17.5,3 19.43,3 21,4.57 21,6.5" />
<path v-if="hasThrottledPushNotifications"
Expand Down Expand Up @@ -164,7 +164,7 @@ export default {
this.theming.color.substring(3, 5),
this.theming.color.substring(5, 7))
const h = hsl[0] * 360
return (h >= 330 || h <= 15) && hsl[1] > 0.7 && (hsl[2] > 0.1 || hsl[2] < 0.6)
return (h >= 330 || h <= 15) && hsl[1] > 0.4 && (hsl[2] > 0.1 || hsl[2] < 0.6)
}
return false
},
Expand Down Expand Up @@ -491,10 +491,6 @@ export default {
</script>

<style scoped lang="scss">
.notifications-button__icon {
filter: var(--background-image-invert-if-bright);
}

.notification-container {
/* Prevent slide animation to go out of the div */
overflow: hidden;
Expand Down