From 94187ab8c86909f1c58c381333d033e3ab51b9e8 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 1 Oct 2024 06:30:17 +0000
Subject: [PATCH] Fieldset header variable zeigt noch auf altes Farbset
Closes #4653
Merge request studip/studip!3465
---
resources/assets/stylesheets/mixins/colors.scss | 7 +++----
resources/assets/stylesheets/scss/forms.scss | 6 +++---
resources/assets/stylesheets/scss/tables.scss | 4 ++--
resources/assets/stylesheets/scss/variables.scss | 5 +++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/resources/assets/stylesheets/mixins/colors.scss b/resources/assets/stylesheets/mixins/colors.scss
index 88398e78666..d464752e379 100644
--- a/resources/assets/stylesheets/mixins/colors.scss
+++ b/resources/assets/stylesheets/mixins/colors.scss
@@ -120,10 +120,6 @@ $brown-60: mix($brown, #fff, 60%); // #ca9eaf
$brown-40: mix($brown, #fff, 40%); // #dcbeb4
$brown-20: mix($brown, #fff, 20%); // #edded9
-// $fieldset-header: $content-color-20;
-$fieldset-header: $dark-gray-color-10;
-$fieldset-border: $base-color-20;
-
// contrast colors
$contrast-content-white: text-contrast($content-color, #ffffff, #000000);
$contrast-content-gray: text-contrast($content-color, $dark-gray-color, #000000 , 67);
@@ -271,6 +267,9 @@ $color--table-border: $color--gray-6;
$color--table-focus: $color--gray-6;
$color--table-hover: $color--gray-6;
+$color--fieldset-header: $color--gray-6;
+$color--fieldset-border: $color--gray-5;
+
$color--button-background: $color--white;
$color--button-border: $color--blue-1;
$color--button-focus: $color--blue-1;
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 12dedc836b9..7b81dca3708 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -201,15 +201,15 @@ form.default {
fieldset {
box-sizing: border-box;
border: none;
- border: solid 1px var(--content-color-40);
+ border: solid 1px var(--color--fieldset-border);
margin: 0 0 15px;
min-width: auto;
padding: 0 0 10px 0;
> legend {
box-sizing: border-box;
- background-color: var(--fieldset-header);
- border: solid 1px var(--content-color-40);
+ background-color: var(--color--fieldset-header);
+ border: solid 1px var(--color--fieldset-border);
border-bottom: 0;
font-size: $font-size-h3;
padding: 10px;
diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 094a0d6b568..85e09f3f8c4 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -891,7 +891,7 @@ table.course-search {
caption.legend {
box-sizing: border-box;
- background-color: $fieldset-header;
+ background-color: var(--color--table-header);
border: 1px solid var(--color--table-border);
border-bottom: 0;
color: var(--brand-color-dark);
@@ -962,7 +962,7 @@ table.show-tree {
}
a:hover {
- background-color: $fieldset-header !important;
+ background-color: var(--color--table-header) !important;
color: var(--base-color) !important;
}
}
diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss
index 5df903d6090..889d5f2e23f 100644
--- a/resources/assets/stylesheets/scss/variables.scss
+++ b/resources/assets/stylesheets/scss/variables.scss
@@ -123,8 +123,6 @@ $grid-gap: 0;
#{"--"}dark-violet-40: $dark-violet-40;
#{"--"}dark-violet-60: $dark-violet-60;
#{"--"}dark-violet-80: $dark-violet-80;
- #{"--"}fieldset-border: $fieldset-border;
- #{"--"}fieldset-header: $fieldset-header;
#{"--"}green: $green;
#{"--"}green-20: $green-20;
#{"--"}green-40: $green-40;
@@ -236,6 +234,9 @@ $grid-gap: 0;
#{"--"}color--table-focus: $color--table-focus;
#{"--"}color--table-hover: $color--table-hover;
+ #{"--"}color--fieldset-border: $color--fieldset-border;
+ #{"--"}color--fieldset-header: $color--fieldset-header;
+
#{"--"}color--button-background: $color--button-background;
#{"--"}color--button-border: $color--button-border;
#{"--"}color--button-focus: $color--button-focus;
--
GitLab