From 2ec89581f92a83d10ceb30c2aa5c1f2d93432e3d Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Wed, 16 Oct 2024 10:09:01 +0000
Subject: [PATCH] =?UTF-8?q?Nav-Ebene=202=20hat=20unterschiedliche=20H?=
=?UTF-8?q?=C3=B6hen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #4704
Merge request studip/studip!3497
---
resources/assets/stylesheets/scss/header.scss | 4 +---
resources/assets/stylesheets/scss/tabs.scss | 2 ++
resources/assets/stylesheets/scss/variables.scss | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/resources/assets/stylesheets/scss/header.scss b/resources/assets/stylesheets/scss/header.scss
index 74ee95e5140..18f007cedfe 100644
--- a/resources/assets/stylesheets/scss/header.scss
+++ b/resources/assets/stylesheets/scss/header.scss
@@ -162,9 +162,8 @@
align-items: center;
justify-content: space-between;
background-color: var(--color--main-navigation-background);
- font-size: 0.9em;
color: var(--color--font-primary);
- min-height: 2.3em;
+ min-height: ceil($font-size-navigation2 * 2.25); // 16px * 2.25 = 36px
border-bottom: 1px solid var(--color--main-navigation-border);
padding-left: $page-margin;
padding-right: $page-margin;
@@ -174,7 +173,6 @@
transition: margin-left;
transition-duration: var(--transition-duration);
transition-delay: 500ms;
- font-size: 1.25em;
}
> ul {
diff --git a/resources/assets/stylesheets/scss/tabs.scss b/resources/assets/stylesheets/scss/tabs.scss
index ad0f5396af2..0f64d40b8c2 100644
--- a/resources/assets/stylesheets/scss/tabs.scss
+++ b/resources/assets/stylesheets/scss/tabs.scss
@@ -31,6 +31,8 @@ div.clear
li {
margin: 0 8px;
+ font-size: $font-size-navigation2;
+
&:first-child {
margin-left: 0;
}
diff --git a/resources/assets/stylesheets/scss/variables.scss b/resources/assets/stylesheets/scss/variables.scss
index 889d5f2e23f..605dca75766 100644
--- a/resources/assets/stylesheets/scss/variables.scss
+++ b/resources/assets/stylesheets/scss/variables.scss
@@ -17,6 +17,7 @@ $font-size-h4: $font-size-base;
$font-size-h5: $font-size-base;
$font-size-h6: $font-size-base;
+$font-size-navigation2: ceil($font-size-base * 1.1); // 16px
$font-size-widget-header: $font-size-large;
$font-size-caption: $font-size-h1;
--
GitLab