Merge branch 'develop'

* develop: Fix firefox infitnite height
ClimateWatch-Vizzuality · Nov 3, 2017 · 2a29065 · 2a29065
2 parents 2c3b247 + f0edc5a
commit 2a29065
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/app/javascript/app/components/country-ghg-emissions/country-ghg-emissions-styles.scss b/app/javascript/app/components/country-ghg-emissions/country-ghg-emissions-styles.scss
@@ -9,6 +9,7 @@
   grid-auto-flow: column;
   grid-gap: $gutter-padding;
   height: 100%;
+  max-height: 800px;
   border-right: solid 1px $border-color;
   padding-right: $gutter-padding;