net-art-uchicago / cta-file-sharing

a collaborative artware project by Media Art and Design students at the University of Chicago.
GNU General Public License v3.0
2 stars 15 forks source link

added quotes to hyphenated words #30

Closed ajchu28 closed 1 year ago

ajchu28 commented 1 year ago

Here is the map and popup code on a feature branch with the JS separated and the html/css put into the correct files.

nbriz commented 1 year ago

@ajchu28 i just merged @yruann 's PR, i think now would be a good time to pull her changes into ur feature branch

git pull upstream main

&& then integrate the code u've written in ur frontend/mapScript.js into her frontend/js/map.js script (&& then removing ur mapScript.js

ajchu28 commented 1 year ago

Changes made in merge: