From 13bd593a0a34a99731e996beb4e3a600a9a17a9d Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Wed, 16 Jul 2025 15:22:13 +0200 Subject: use new default role for icons, fixes #5729 --- lib/classes/Icon.php | 4 +++- resources/assets/stylesheets/scss/icons.scss | 2 +- resources/vue/components/StudipIcon.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/classes/Icon.php b/lib/classes/Icon.php index 2ddc4a1..f12cdae 100644 --- a/lib/classes/Icon.php +++ b/lib/classes/Icon.php @@ -22,8 +22,9 @@ class Icon implements JsonSerializable public const SIZE_LARGE = 32; public const DEFAULT_COLOR = 'blue'; - public const DEFAULT_ROLE = 'clickable'; + public const DEFAULT_ROLE = 'default'; + public const ROLE_DEFAULT = 'default'; public const ROLE_INFO = 'info'; public const ROLE_CLICKABLE = 'clickable'; public const ROLE_ACCEPT = 'accept'; @@ -47,6 +48,7 @@ class Icon implements JsonSerializable * This is the magical Role to Color mapping. */ private static array $roles_to_colors = [ + self::ROLE_DEFAULT => self::DEFAULT_COLOR, self::ROLE_INFO => 'black', self::ROLE_CLICKABLE => 'blue', self::ROLE_ACCEPT => 'green', diff --git a/resources/assets/stylesheets/scss/icons.scss b/resources/assets/stylesheets/scss/icons.scss index c6d3ccc..252c0c9 100644 --- a/resources/assets/stylesheets/scss/icons.scss +++ b/resources/assets/stylesheets/scss/icons.scss @@ -1,6 +1,7 @@ $icon-colors: ( accept: good, attention: warning, + clickable: highlight, info_alt: white, inactive: font-inactive, new: red-1, @@ -9,7 +10,6 @@ $icon-colors: ( status-yellow: yellow-1, // This are disabled for now since they should be coloured in a different way -// clickable: blue, // info: black, // navigation: blue, // sort: blue, diff --git a/resources/vue/components/StudipIcon.vue b/resources/vue/components/StudipIcon.vue index 1f68c66..5a7fff2 100644 --- a/resources/vue/components/StudipIcon.vue +++ b/resources/vue/components/StudipIcon.vue @@ -33,7 +33,7 @@ interface IconProps { } const props = withDefaults(defineProps(),{ - role: 'clickable', + role: 'default', size: null, inline: false }); -- cgit v1.0