From f9887c3c51253cf1a7499fed8f8189c015f5a4aa Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 7 Dec 2022 20:40:43 +0000
Subject: [PATCH] fix wrong usage of mix(), fixes #1868
Closes #1868
Merge request studip/studip!1222
---
resources/assets/stylesheets/scss/big-image-handler.scss | 4 ++--
resources/assets/stylesheets/scss/dialog.scss | 2 +-
resources/assets/stylesheets/scss/studip-overlay.scss | 2 +-
resources/assets/stylesheets/scss/studip-selection.scss | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/assets/stylesheets/scss/big-image-handler.scss b/resources/assets/stylesheets/scss/big-image-handler.scss
index 30504a36f89..863ab345fdb 100644
--- a/resources/assets/stylesheets/scss/big-image-handler.scss
+++ b/resources/assets/stylesheets/scss/big-image-handler.scss
@@ -1,4 +1,4 @@
-$bg-big-image-handler: mix($black, $white, 30%);
+$bg-big-image-handler: fade-out($black, 0.3);
.oversized-image {
cursor: zoom-in;
@@ -31,7 +31,7 @@ $bg-big-image-handler: mix($black, $white, 30%);
background-repeat: no-repeat;
background-size: contain;
border: 1px solid $white;
- box-shadow: 0 0 20px mix($black, $white, 50%);
+ box-shadow: 0 0 20px fade-out($white, 0.5);
display: block;
max-width: 98%;
max-height: 98%;
diff --git a/resources/assets/stylesheets/scss/dialog.scss b/resources/assets/stylesheets/scss/dialog.scss
index 81804ec5c8d..d273ccb9d91 100644
--- a/resources/assets/stylesheets/scss/dialog.scss
+++ b/resources/assets/stylesheets/scss/dialog.scss
@@ -1,5 +1,5 @@
.ui-widget-overlay {
- background: transparentize($base-gray, .2);
+ background: fade-out($base-gray, 0.2);
opacity: 1;
position: fixed;
}
diff --git a/resources/assets/stylesheets/scss/studip-overlay.scss b/resources/assets/stylesheets/scss/studip-overlay.scss
index d7dbb928da2..a3dd66a17a3 100644
--- a/resources/assets/stylesheets/scss/studip-overlay.scss
+++ b/resources/assets/stylesheets/scss/studip-overlay.scss
@@ -16,7 +16,7 @@
bottom: 0;
&-local {
- background-color: mix($light-gray-color, $white, 50%);
+ background-color: fade-out($light-gray-color, 0.5);
position: absolute;
}
diff --git a/resources/assets/stylesheets/scss/studip-selection.scss b/resources/assets/stylesheets/scss/studip-selection.scss
index 6985dffad11..db539f1f797 100644
--- a/resources/assets/stylesheets/scss/studip-selection.scss
+++ b/resources/assets/stylesheets/scss/studip-selection.scss
@@ -31,7 +31,7 @@
}
li.empty-placeholder {
- color: mix($text-color, $white, 30%);
+ color: fade-out($text-color, 0.3);
&:not(:only-child) {
display: none;
--
GitLab