From b37dacffdc70d26fb8e3ef0958f1512d9f2dc689 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 27 Sep 2022 07:14:06 +0000
Subject: [PATCH] rename scss-function, closes #1603
Closes #1603
Merge request studip/studip!1031
---
.../assets/stylesheets/highcontrast.scss | 30 +++++++++----------
.../assets/stylesheets/mixins/colors.scss | 6 ++--
resources/assets/stylesheets/mixins/misc.scss | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/resources/assets/stylesheets/highcontrast.scss b/resources/assets/stylesheets/highcontrast.scss
index e73af50dda0..2d65b043d25 100644
--- a/resources/assets/stylesheets/highcontrast.scss
+++ b/resources/assets/stylesheets/highcontrast.scss
@@ -596,7 +596,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-1;
dt {
background-color: $calendar-category-1;
- color: contrast($calendar-category-1, $black, $white);
+ color: text-contrast($calendar-category-1, $black, $white);
}
dd {
color: $black;
@@ -607,7 +607,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-2;
dt {
background-color: $calendar-category-2;
- color: contrast($calendar-category-2, $black, $white);
+ color: text-contrast($calendar-category-2, $black, $white);
}
dd {
color: $black;
@@ -618,7 +618,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-3;
dt {
background-color: $calendar-category-3;
- color: contrast($calendar-category-3, $black, $white);
+ color: text-contrast($calendar-category-3, $black, $white);
}
dd {
color: $black;
@@ -629,7 +629,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-4;
dt {
background-color: $calendar-category-4;
- color: contrast($calendar-category-4, $black, $white);
+ color: text-contrast($calendar-category-4, $black, $white);
}
dd {
color: $black;
@@ -640,7 +640,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-5;
dt {
background-color: $calendar-category-5;
- color: contrast($calendar-category-5, $black, $white);
+ color: text-contrast($calendar-category-5, $black, $white);
}
dd {
color: $black;
@@ -651,7 +651,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-6;
dt {
background-color: $calendar-category-6;
- color: contrast($calendar-category-6, $black, $white);
+ color: text-contrast($calendar-category-6, $black, $white);
}
dd {
color: $black;
@@ -662,7 +662,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-7;
dt {
background-color: $calendar-category-7;
- color: contrast($calendar-category-7, $black, $white);
+ color: text-contrast($calendar-category-7, $black, $white);
}
dd {
color: $black;
@@ -673,7 +673,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-8;
dt {
background-color: $calendar-category-8;
- color: contrast($calendar-category-8, $black, $white);
+ color: text-contrast($calendar-category-8, $black, $white);
}
dd {
color: $black;
@@ -684,7 +684,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-9;
dt {
background-color: $calendar-category-9;
- color: contrast($calendar-category-9, $black, $white);
+ color: text-contrast($calendar-category-9, $black, $white);
}
dd {
color: $black;
@@ -695,7 +695,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-10;
dt {
background-color: $calendar-category-10;
- color: contrast($calendar-category-10, $black, $white);
+ color: text-contrast($calendar-category-10, $black, $white);
}
dd {
color: $black;
@@ -706,7 +706,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-11;
dt {
background-color: $calendar-category-11;
- color: contrast($calendar-category-11, $black, $white);
+ color: text-contrast($calendar-category-11, $black, $white);
}
dd {
color: $black;
@@ -717,7 +717,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-12;
dt {
background-color: $calendar-category-12;
- color: contrast($calendar-category-12, $black, $white);
+ color: text-contrast($calendar-category-12, $black, $white);
}
dd {
color: $black;
@@ -728,7 +728,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-13;
dt {
background-color: $calendar-category-13;
- color: contrast($calendar-category-13, $black, $white);
+ color: text-contrast($calendar-category-13, $black, $white);
}
dd {
color: $black;
@@ -739,7 +739,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-14;
dt {
background-color: $calendar-category-14;
- color: contrast($calendar-category-14, $black, $white);
+ color: text-contrast($calendar-category-14, $black, $white);
}
dd {
color: $black;
@@ -750,7 +750,7 @@ div.schedule_entry {
border: 1px solid $calendar-category-15;
dt {
background-color: $calendar-category-15;
- color: contrast($calendar-category-15, $black, $white);
+ color: text-contrast($calendar-category-15, $black, $white);
}
dd {
color: $black;
diff --git a/resources/assets/stylesheets/mixins/colors.scss b/resources/assets/stylesheets/mixins/colors.scss
index 99ba8de5937..d58e4468fd1 100644
--- a/resources/assets/stylesheets/mixins/colors.scss
+++ b/resources/assets/stylesheets/mixins/colors.scss
@@ -124,9 +124,9 @@ $fieldset-header: $content-color-20;
$fieldset-border: $base-color-20;
// contrast colors
-$contrast-content-white: contrast($content-color, #ffffff, #000000, 67%);
-$contrast-content-gray: contrast($content-color, $dark-gray-color, #000000 , 67%);
-$contrast-content-hovergray: contrast($content-color, $dark-gray-color-10, $dark-gray-color);
+$contrast-content-white: text-contrast($content-color, #ffffff, #000000, 67%);
+$contrast-content-gray: text-contrast($content-color, $dark-gray-color, #000000 , 67%);
+$contrast-content-hovergray: text-contrast($content-color, $dark-gray-color-10, $dark-gray-color);
$public-course-bgcolor: $red;
diff --git a/resources/assets/stylesheets/mixins/misc.scss b/resources/assets/stylesheets/mixins/misc.scss
index 626afd8c4d6..ef2f277296e 100644
--- a/resources/assets/stylesheets/mixins/misc.scss
+++ b/resources/assets/stylesheets/mixins/misc.scss
@@ -30,6 +30,6 @@
}
// https://codepen.io/kennyglenn/pen/kxqWjP
-@function contrast($color, $dark, $light, $threshold: 50%) {
+@function text-contrast($color, $dark, $light, $threshold: 50%) {
@return if(lightness($color) > $threshold, $light, $dark)
}
--
GitLab