Merge pull request #12444 from jdalsem/flex-shorthand

chore(css): set a more explicit flex shorthand
Elgg · Mar 13, 2019 · f0ca9d9 · f0ca9d9
2 parents f81adb1 + 4eeec4f
commit f0ca9d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/views/default/elements/components/image_block.css b/views/default/elements/components/image_block.css
@@ -20,7 +20,7 @@
 }
 
 .elgg-image-block > .elgg-body {
-	flex: 1;
+	flex: 1 1 auto;
 }
 
 .elgg-image-block.elgg-chip {

diff --git a/views/default/elements/components/menus.css b/views/default/elements/components/menus.css
@@ -305,7 +305,7 @@
 }
 
 .elgg-menu-hover .elgg-menu {
-	flex: 1;
+	flex: 1 1 auto;
 	max-width: 20rem;
 
 	&.elgg-menu-hover-actions {

diff --git a/views/default/elements/layout/columns.css b/views/default/elements/layout/columns.css
@@ -12,33 +12,30 @@
 	border-top: 1px solid $(border-color-soft);
 }
 
-.elgg-layout-columns,
 .elgg-layout-columns {
 	display: flex;
 	align-items: stretch;
 	flex-direction: column;
-}
-
-.elgg-layout-columns > .elgg-body,
-.elgg-layout-columns > .elgg-body {
-	flex: 1;
-}
-
-.elgg-layout-columns > .elgg-sidebar {
-	float: none;
-	order: 1;
-}
+
+	> .elgg-body {
+		flex: 1 1 0%;
+	}
+
+	> .elgg-sidebar {
+		float: none;
+		order: 1;
+	}
 
-.elgg-layout-columns > .elgg-sidebar {
-	order: 2;
-}
+	> .elgg-sidebar {
+		order: 2;
+	}
 
-.elgg-layout-columns > .elgg-sidebar-alt {
-	order: 0;
+	> .elgg-sidebar-alt {
+		order: 0;
+	}
 }
 
 @media $(media-desktop-up) {
-	.elgg-layout-columns,
 	.elgg-layout-columns {
 		flex-direction: row;
 	}