Skip to content

Commit 2127c45

Browse files
committed
Merge branch 'develop'
* develop: Move to heroku Move to heroku # Conflicts: # components/Map/index.vue # components/Search/index.vue # pages/index.vue # yarn.lock
2 parents 93faf27 + 21accf9 commit 2127c45

File tree

6 files changed

+15011
-13
lines changed

6 files changed

+15011
-13
lines changed

Procfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
web: npm run start

components/Map/index.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default {
2424
container: 'map',
2525
style: 'mapbox://styles/mapbox/dark-v10',
2626
center: [122, 13],
27-
zoom: 3
27+
zoom: 1.6
2828
})
2929
3030
let markers = {}
@@ -154,10 +154,10 @@ export default {
154154
.addTo(map)
155155
})
156156
157-
map.on('mouseenter', 'clusters', () => map.getCanvas().style.cursor = 'pointer')
158-
map.on('mouseleave', 'clusters', () => map.getCanvas().style.cursor = '')
159-
map.on('mouseenter', 'unclustered-point', () => map.getCanvas().style.cursor = 'pointer')
160-
map.on('mouseleave', 'unclustered-point', () => map.getCanvas().style.cursor = '')
157+
map.on('mouseenter', 'clusters', _ => map.getCanvas().style.cursor = 'pointer')
158+
map.on('mouseleave', 'clusters', _ => map.getCanvas().style.cursor = '')
159+
map.on('mouseenter', 'unclustered-point', _ => map.getCanvas().style.cursor = 'pointer')
160+
map.on('mouseleave', 'unclustered-point', _ => map.getCanvas().style.cursor = '')
161161
}
162162
},
163163
mounted() {

components/Search/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default {
4646
transform: translate3d(0, 0px, 0);
4747
}
4848
100% {
49-
transform: translate3d(0, 8px, 0);
49+
transform: translate3d(0, 5px, 0);
5050
}
5151
}
5252
</style>

0 commit comments

Comments
 (0)