Merge branch 'master' into feat/DGDS-96--see-all-locations

openearth · Apr 26, 2019 · 1eb8fde · 1eb8fde
2 parents 51aca67 + 0b0c559
commit 1eb8fde
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.gitmessage b/.gitmessage
@@ -0,0 +1,5 @@
+# When applied this commit will:
+
+
+# Why do we need this?
+
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -35,8 +35,8 @@ export default {
   css: [
     'mapbox-gl/dist/mapbox-gl.css',
     '~/css/main.css',
-    '~/css/typography',
-    '~/css/helpers',
+    '~/css/typography.css',
+    '~/css/helpers.css',
   ],
 
   /*

diff --git a/pages/_datasetIds/_locationId.vue b/pages/_datasetIds/_locationId.vue
@@ -75,6 +75,7 @@ export default {
   left: 0;
   background-color: var(--color-background);
   box-shadow: var(--shadow);
+  overflow-x: hidden;
 }
 
 .location-id__header {

diff --git a/test/unit/layouts/default.spec.js b/test/unit/layouts/default.spec.js
@@ -77,7 +77,7 @@ describe('Default', () => {
     })
   })
 
-  test('update url with new locationId on select-locations mapbox event', () => {
+  test('update url with new datasetIds on select-locations mapbox event', () => {
     const routerPush = jest.fn()
     const wrapper = shallowMount(Default, {
       store,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		# When applied this commit will:


		# Why do we need this?