aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Lucke <lucke@elan-ev.de>2025-07-14 15:36:14 +0200
committerRon Lucke <lucke@elan-ev.de>2025-07-14 15:36:14 +0200
commite04fa1e9b79f784628d640d4c0355f5eba61da01 (patch)
treef47d200840e593bd11a77233bdb53e783e4248c3
parent10c592400c263e1e6de3958ce1e77a52322f5c72 (diff)
LayoutFehler nach Merge des Color-Themings
Closes #5720 Merge request studip/studip!4353
-rw-r--r--db/migrations/6.1.14_add_themes_table.php2
-rw-r--r--lib/models/Theme.php2
-rw-r--r--resources/assets/stylesheets/scss/index.scss2
-rw-r--r--resources/assets/stylesheets/scss/sidebar.scss2
-rw-r--r--resources/assets/stylesheets/scss/wizard.scss13
5 files changed, 10 insertions, 11 deletions
diff --git a/db/migrations/6.1.14_add_themes_table.php b/db/migrations/6.1.14_add_themes_table.php
index f5ccc70..494ea5d 100644
--- a/db/migrations/6.1.14_add_themes_table.php
+++ b/db/migrations/6.1.14_add_themes_table.php
@@ -39,7 +39,7 @@ final class AddThemesTable extends Migration
'--color--font-inverted' => '#ffffff',
'--color--main-navigation-item' => '#28497c',
'--color--sidebar-item' => '#28497c',
- '--color--sidebar-item-hover' => '#d60000',
+ '--color--sidebar-item-hover' => '#101010',
'--color--highlight' => '#28497c',
'--color--highlight-hover' => '#d60000',
'--color--content-link' => '#28497c',
diff --git a/lib/models/Theme.php b/lib/models/Theme.php
index e1d93b5..2b25d6e 100644
--- a/lib/models/Theme.php
+++ b/lib/models/Theme.php
@@ -42,7 +42,7 @@
],
'sidebar' => [
'--color--sidebar-item' => '#28497c',
- '--color--sidebar-item-hover' => '#d60000',
+ '--color--sidebar-item-hover' => '#101010',
],
'content' => [
'--color--highlight' => '#28497c',
diff --git a/resources/assets/stylesheets/scss/index.scss b/resources/assets/stylesheets/scss/index.scss
index 209eb9b..482ba44 100644
--- a/resources/assets/stylesheets/scss/index.scss
+++ b/resources/assets/stylesheets/scss/index.scss
@@ -416,7 +416,7 @@ $gap-between-boxes: calc($login-page-margin / 2);
text-decoration: underline;
}
}
- img {
+ svg {
vertical-align: middle;
}
.tooltip {
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 0043549..8510665 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -125,7 +125,7 @@ ul.widget-list {
text-indent: 0;
}
- &:has(>button:not(.options-radio, .options-checkbox)), &:has(>a:not(:last-child, .options-radio, .options-checkbox)) {
+ &:has(>button:not(.options-radio, .options-checkbox)), &:has(>a):not(:last-child, .options-radio, .options-checkbox) {
border-bottom: solid thin var(--color--sidebar-divider);
}
diff --git a/resources/assets/stylesheets/scss/wizard.scss b/resources/assets/stylesheets/scss/wizard.scss
index 8c869c2..df3d86a 100644
--- a/resources/assets/stylesheets/scss/wizard.scss
+++ b/resources/assets/stylesheets/scss/wizard.scss
@@ -10,6 +10,7 @@
flex-shrink: 0;
.studip-icon {
+ display: block;
margin: auto;
}
@@ -39,15 +40,9 @@
cursor: pointer;
&:hover {
- color: var(--color--highlight--hover);
+ color: var(--color--highlight-hover);
}
}
-
- img {
- padding-right: 4px;
- display: inline-block;
- vertical-align: sub;
- }
}
}
}
@@ -209,6 +204,10 @@ form.default fieldset.radiobutton-set {
>.check {
display: none;
}
+ >.icon,
+ >.studip-icon {
+ color: var(--color--highlight);
+ }
}
>label:first-of-type {