Merge branch '1.0' into 1.1

# Conflicts: # client/dist/styles/bundle.css
silverstripe · Jun 25, 2018 · 0233a6b · 0233a6b
2 parents 9c88845 + 8e5905f
commit 0233a6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/styles/_layout.scss b/client/src/styles/_layout.scss
@@ -108,6 +108,7 @@ body {
 .flexbox-area-grow {
   -ms-flex: 1;
   flex: 1;
+  min-width: 0; // Allows some browsers to shrink below the width of their contents.
 }
 
 .cms .flexbox-display {