search

net-art-and-cultures / data-bodies

GNU General Public License v3.0
1 stars 6 forks source link

Removed wheel info, added scroll info and added window width constant #37

Closed jluo98 closed 4 years ago

jluo98 commented 4 years ago

Plus removed .DS_Store files

nbriz commented 4 years ago

hey @Steve-luo i'm hesitent to accept this pull request b/c i know that @zylemma && @jwham92 are working on addon/content-scripts/background-script.js. did u wall discuss this change in class already? if so i'll merge it && everyone can then fetch + merge these updates on their end. but i want to make sure that no one else is currently modifying this file so we avoid merge conflicts.

@zylemma && @jwham92 can u confirm whether or not u're expecting these updates?

jluo98 commented 4 years ago

I haven’t talked to them yet. This is just the version I tested that works. The wheel info was not working so I added scroll instead.

nbriz commented 4 years ago

ah, ok. in that case in order to avoid merge conflicts, let's try this: @zylemma && @jwham92 can u take a look at the changes @Steve-luo is proposing here . the red lines are stuff he's suggesting be deleted && the green is the stuff he's suggesting to add/edit. try it out on ur end && if it works keep it && we'll include it in the next PR that @zylemma or @jwham92 do.