From 1667aaabd6955d044be65fa4c09fbdd3ac700188 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 13 Apr 2022 13:17:23 +0000
Subject: [PATCH] change color of sort to blue, fixes #920
Closes #920
---
lib/classes/Icon.class.php | 2 +-
resources/assets/stylesheets/mixins/studip.less | 4 ++--
resources/assets/stylesheets/mixins/studip.scss | 4 +---
resources/vue/components/StudipIcon.vue | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/classes/Icon.class.php b/lib/classes/Icon.class.php
index b2d934d182d..3070aecd2a5 100644
--- a/lib/classes/Icon.class.php
+++ b/lib/classes/Icon.class.php
@@ -52,7 +52,7 @@ class Icon
self::ROLE_ATTENTION => 'red',
self::ROLE_STATUS_RED => 'red',
self::ROLE_INFO_ALT => 'white',
- self::ROLE_SORT => 'yellow',
+ self::ROLE_SORT => 'blue',
self::ROLE_STATUS_YELLOW => 'yellow'
];
diff --git a/resources/assets/stylesheets/mixins/studip.less b/resources/assets/stylesheets/mixins/studip.less
index 856e95f94ea..57847cfc750 100644
--- a/resources/assets/stylesheets/mixins/studip.less
+++ b/resources/assets/stylesheets/mixins/studip.less
@@ -63,7 +63,7 @@
@color: 'black';
}
-.role2color(@role) when (@role = 'clickable'), (@role = 'link') {
+.role2color(@role) when (@role = 'clickable'), (@role = 'link'), (@role = 'sort') {
@color: 'blue';
}
@@ -87,7 +87,7 @@
@color: 'white';
}
-.role2color(@role) when (@role = 'sort'), (@role = 'status-yellow') {
+.role2color(@role) when (@role = 'status-yellow') {
@color: 'yellow';
}
diff --git a/resources/assets/stylesheets/mixins/studip.scss b/resources/assets/stylesheets/mixins/studip.scss
index c8c93a61b18..407608f14c7 100644
--- a/resources/assets/stylesheets/mixins/studip.scss
+++ b/resources/assets/stylesheets/mixins/studip.scss
@@ -55,13 +55,11 @@
$color: 'green';
} @else if $role == inactive {
$color: 'grey';
- } @else if $role == navigation {
- $color: 'blue';
} @else if $role == new or $role == attention or $role == status-red {
$color: 'red';
} @else if $role == info_alt or $role == info-alt {
$color: 'white';
- } @else if $role == sort or $role == status-yellow {
+ } @else if $role == status-yellow {
$color: 'yellow';
}
diff --git a/resources/vue/components/StudipIcon.vue b/resources/vue/components/StudipIcon.vue
index b968d4ae72e..d750df3f23b 100644
--- a/resources/vue/components/StudipIcon.vue
+++ b/resources/vue/components/StudipIcon.vue
@@ -50,13 +50,13 @@
case 'info_alt':
return 'white';
- case 'sort':
case 'status-yellow':
return 'yellow';
case 'lightblue':
return 'lightblue';
+ case 'sort':
case 'clickable':
case 'navigation':
default:
--
GitLab