From 95f4b928ba7b23128ed73dd2196c5285e9d4c9a0 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 15 Oct 2024 11:17:12 +0000
Subject: [PATCH] Icons und Logo im Header nicht richtig ausgerichtet
Closes #4685
Merge request studip/studip!3486
---
resources/assets/stylesheets/scss/header.scss | 8 ++++----
resources/assets/stylesheets/scss/helpbar.scss | 3 ---
resources/assets/stylesheets/scss/responsive.scss | 8 +++++---
resources/assets/stylesheets/scss/tabs.scss | 1 -
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/resources/assets/stylesheets/scss/header.scss b/resources/assets/stylesheets/scss/header.scss
index b2f271538b7..74ee95e5140 100644
--- a/resources/assets/stylesheets/scss/header.scss
+++ b/resources/assets/stylesheets/scss/header.scss
@@ -83,7 +83,6 @@
#top-logo {
flex: 0 1 auto;
- margin: -13px 12px 0 20px;
&.studip-logo {
@include hide-text();
@@ -94,7 +93,6 @@
background-position: left;
display: block;
width: 130px;
- height: 81px;
margin-right: 30px;
}
}
@@ -111,6 +109,7 @@
align-items: stretch;
justify-content: flex-start;
flex-grow: 1;
+ background-color: var(--color--main-navigation-background);
&.oversized {
overflow: visible;
@@ -134,6 +133,7 @@
color: var(--color--font-primary);
height: 30px;
padding: 10px 15px 5px 15px;
+ margin-bottom: 10px;
max-height: 30px;
overflow: hidden;
background-color: var(--color--main-navigation-background);
@@ -159,7 +159,7 @@
.tabs_wrapper {
display: flex;
flex-direction: row;
- align-items: stretch;
+ align-items: center;
justify-content: space-between;
background-color: var(--color--main-navigation-background);
font-size: 0.9em;
@@ -167,7 +167,7 @@
min-height: 2.3em;
border-bottom: 1px solid var(--color--main-navigation-border);
padding-left: $page-margin;
- padding-top: 10px;
+ padding-right: $page-margin;
}
#tabs {
diff --git a/resources/assets/stylesheets/scss/helpbar.scss b/resources/assets/stylesheets/scss/helpbar.scss
index 56903fdc161..f073190a90d 100644
--- a/resources/assets/stylesheets/scss/helpbar.scss
+++ b/resources/assets/stylesheets/scss/helpbar.scss
@@ -13,12 +13,9 @@ $border-width: 4px;
clear: both;
height: 28px;
position: relative;
- top: 1px;
min-width: 32px;
right: 10px;
- float: right;
-
h2, h3 {
border-bottom: 0;
color: var(--white);
diff --git a/resources/assets/stylesheets/scss/responsive.scss b/resources/assets/stylesheets/scss/responsive.scss
index 2ceed4888c5..c2ca5c367fd 100644
--- a/resources/assets/stylesheets/scss/responsive.scss
+++ b/resources/assets/stylesheets/scss/responsive.scss
@@ -25,12 +25,14 @@ $sidebarOut: -330px;
#non-responsive-toggle-fullscreen {
margin-left: auto;
- margin-right: 10px;
- position: relative;
- top: 2px;
+
+ button {
+ padding: 0;
+ }
img {
cursor: pointer;
+ vertical-align: middle;
}
}
diff --git a/resources/assets/stylesheets/scss/tabs.scss b/resources/assets/stylesheets/scss/tabs.scss
index b5c90aae6c1..ad0f5396af2 100644
--- a/resources/assets/stylesheets/scss/tabs.scss
+++ b/resources/assets/stylesheets/scss/tabs.scss
@@ -7,7 +7,6 @@ div.clear
// Common styles for both tab sets
#tabs {
line-height: 20px;
- float: none;
flex: 0 1 auto;
margin: 0;
--
GitLab