From 7a8e62fb3a8faf5487d6c0f820370532d2e16924 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Fri, 1 Jul 2022 10:38:33 +0000
Subject: [PATCH] fix width of flex elements, don't set flex to the default
values, fixes #1225
Closes #1225
Merge request studip/studip!746
---
.../assets/stylesheets/less/layouts.less | 29 ++++---------------
.../less/navigation-hoverborder.less | 22 --------------
2 files changed, 5 insertions(+), 46 deletions(-)
diff --git a/resources/assets/stylesheets/less/layouts.less b/resources/assets/stylesheets/less/layouts.less
index 78d2243ce3d..e5123aabd57 100644
--- a/resources/assets/stylesheets/less/layouts.less
+++ b/resources/assets/stylesheets/less/layouts.less
@@ -149,12 +149,11 @@
color: @contrast-content-white;
display: flex;
padding: 2px 0px;
- flex: 0 1 auto; // fourth row of flex-main
min-width: @site-width;
width: 100%;
}
#footer {
- flex: 1;
+ flex-grow: 1;
margin-left: 8px;
margin-top: 2px;
line-height: 28px;
@@ -176,26 +175,15 @@
flex-wrap: nowrap;
align-content: stretch;
align-items: stretch;
- justify-content: flex-start;
+ justify-content: space-between;
width: 100%;
min-width: @site-width;
- flex: 0 1 auto;
border-bottom: 1px solid @light-gray-color-40;
-
- #barTopMenu { // column 1 of flex-header
- flex: 1 1 auto;
- }
-
- #barTopStudip { // column 2 of flex-header
- flex: 0 1 auto;
- }
}
#barBottomContainer { // second row of flex-main
- flex: 0 1 auto;
-
min-width: @site-width;
z-index: 1001; // High enough so it will be above the sidebar
}
@@ -208,7 +196,7 @@
align-items: stretch;
justify-content: flex-start;
- flex: 10 1 auto;
+ flex-grow: 1;
min-width: @page-width;
@@ -223,8 +211,6 @@
}
#tabs { // row 1 of layout_page
- width: 100%;
- flex: 0 1 auto;
padding-left: @page-margin;
transition: margin-left;
transition-duration: 300ms;
@@ -239,17 +225,12 @@
align-items: stretch;
justify-content: flex-start;
- flex: 1 1 auto;
+ flex-grow: 1;
min-width: @page-width;
#layout_content { // column 1 of layout_container
- flex: 1 1 auto;
- }
-
- #layout_sidebar { // column 2 of layout_container
- flex: 0 1 auto;
+ flex-grow: 1;
}
-
}
}
diff --git a/resources/assets/stylesheets/less/navigation-hoverborder.less b/resources/assets/stylesheets/less/navigation-hoverborder.less
index bd81f6835cb..d6a1a66dcfb 100644
--- a/resources/assets/stylesheets/less/navigation-hoverborder.less
+++ b/resources/assets/stylesheets/less/navigation-hoverborder.less
@@ -77,26 +77,4 @@ body:not(.fixed) #barTopMenu {
}
}
}
-
- &:hover > li:not(:hover)::after {
- .border-shrink();
- }
}
-
-/*#barTopAvatar {
- &:not(.fixed) {
- &, &.active, &:hover {
- line-height: 25px;
- padding-top: 3px;
- }
- &.active {
- .border-beneath('dark', 1px);
- }
- &:not(.active) {
- .border-beneath('light', 1px);
- &:not(:hover)::after {
- .border-shrink();
- }
- }
- }
-}*/
--
GitLab