Skip to content
Snippets Groups Projects
Commit 5018d5d6 authored by Elmar Ludwig's avatar Elmar Ludwig Committed by Jan-Hendrik Willms
Browse files

fix width of flex elements, don't set flex to the default values, fixes #1225

Closes #1225

Merge request studip/studip!746
parent f84622d4
No related branches found
No related tags found
No related merge requests found
...@@ -149,12 +149,11 @@ ...@@ -149,12 +149,11 @@
color: @contrast-content-white; color: @contrast-content-white;
display: flex; display: flex;
padding: 2px 0px; padding: 2px 0px;
flex: 0 1 auto; // fourth row of flex-main
min-width: @site-width; min-width: @site-width;
width: 100%; width: 100%;
} }
#footer { #footer {
flex: 1; flex-grow: 1;
margin-left: 8px; margin-left: 8px;
margin-top: 2px; margin-top: 2px;
line-height: 28px; line-height: 28px;
...@@ -176,26 +175,15 @@ ...@@ -176,26 +175,15 @@
flex-wrap: nowrap; flex-wrap: nowrap;
align-content: stretch; align-content: stretch;
align-items: stretch; align-items: stretch;
justify-content: flex-start; justify-content: space-between;
width: 100%; width: 100%;
min-width: @site-width; min-width: @site-width;
flex: 0 1 auto;
border-bottom: 1px solid @light-gray-color-40; 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 #barBottomContainer { // second row of flex-main
flex: 0 1 auto;
min-width: @site-width; min-width: @site-width;
z-index: 1001; // High enough so it will be above the sidebar z-index: 1001; // High enough so it will be above the sidebar
} }
...@@ -208,7 +196,7 @@ ...@@ -208,7 +196,7 @@
align-items: stretch; align-items: stretch;
justify-content: flex-start; justify-content: flex-start;
flex: 10 1 auto; flex-grow: 1;
min-width: @page-width; min-width: @page-width;
...@@ -223,8 +211,6 @@ ...@@ -223,8 +211,6 @@
} }
#tabs { // row 1 of layout_page #tabs { // row 1 of layout_page
width: 100%;
flex: 0 1 auto;
padding-left: @page-margin; padding-left: @page-margin;
transition: margin-left; transition: margin-left;
transition-duration: 300ms; transition-duration: 300ms;
...@@ -239,17 +225,12 @@ ...@@ -239,17 +225,12 @@
align-items: stretch; align-items: stretch;
justify-content: flex-start; justify-content: flex-start;
flex: 1 1 auto; flex-grow: 1;
min-width: @page-width; min-width: @page-width;
#layout_content { // column 1 of layout_container #layout_content { // column 1 of layout_container
flex: 1 1 auto; flex-grow: 1;
}
#layout_sidebar { // column 2 of layout_container
flex: 0 1 auto;
} }
} }
} }
......
...@@ -75,26 +75,4 @@ body:not(.fixed) #barTopMenu { ...@@ -75,26 +75,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();
}
}
}
}*/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment