Merge branch 'develop'

TNRIS · Jun 26, 2019 · 5f216d3 · 5f216d3
2 parents a6f3338 + 2147a23
commit 5f216d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/lakegallery/lakegallery/settings.py b/lakegallery/lakegallery/settings.py
@@ -23,7 +23,7 @@
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
-VERSION = '2.1.8'
+VERSION = '2.1.9'
 
 ALLOWED_HOSTS = ['localhost', '0.0.0.0', '.tnris.org', '.tnris.org.']
 

diff --git a/lakegallery/map/static/map/style.css b/lakegallery/map/static/map/style.css
@@ -193,7 +193,7 @@ img.texas-home:hover {
 
 /*INDEX & REGION TEMPLATE MAP*/
 #main {
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 }
 
 body.modal-open {
@@ -633,7 +633,7 @@ hr.separator {
 /*--------------- STORY MOBILE ---------------*/
 
 #mobileContainer {
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 	margin: 0;
 	max-width: 100% !important;
 }
@@ -658,7 +658,6 @@ hr.separator {
 #mobileStoryPanelContainer {
 	z-index: 101;
 	background-color: white;
-	max-height: 100%;
 	width: 100%;
 }
 
@@ -704,7 +703,6 @@ hr.separator {
 .mobileStoryPage {
 	padding-left: 10%;
 	padding-right: 10%;
-	max-height: inherit;
 }
 
 .mobileStoryPage > h2 {
@@ -725,7 +723,7 @@ hr.separator {
 .mobileMapPanel {
 	position: absolute;
 	padding: 0;
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 }
 
 #mobileStoryMap {

diff --git a/lakegallery/static/map/style.css b/lakegallery/static/map/style.css
@@ -193,7 +193,7 @@ img.texas-home:hover {
 
 /*INDEX & REGION TEMPLATE MAP*/
 #main {
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 }
 
 body.modal-open {
@@ -633,7 +633,7 @@ hr.separator {
 /*--------------- STORY MOBILE ---------------*/
 
 #mobileContainer {
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 	margin: 0;
 	max-width: 100% !important;
 }
@@ -658,7 +658,6 @@ hr.separator {
 #mobileStoryPanelContainer {
 	z-index: 101;
 	background-color: white;
-	max-height: 100%;
 	width: 100%;
 }
 
@@ -704,7 +703,6 @@ hr.separator {
 .mobileStoryPage {
 	padding-left: 10%;
 	padding-right: 10%;
-	max-height: inherit;
 }
 
 .mobileStoryPage > h2 {
@@ -725,7 +723,7 @@ hr.separator {
 .mobileMapPanel {
 	position: absolute;
 	padding: 0;
-	height: calc(100vh - 56px);
+	height: calc(100% - 56px);
 }
 
 #mobileStoryMap {