search

net-art-and-cultures / data-bodies

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

Updates on the Gallery WebsiteNov 26 #39

Closed SlShannon closed 4 years ago

SlShannon commented 4 years ago

Made additional changes on the Website

SlShannon commented 4 years ago

Given the container more height px within each gallery box

nbriz commented 4 years ago

hey @SlShannon so we never got a chance to finish the code refactoring that u started w/Ilai in class. but i just sent an email to the entire class w/a video tutorial to download (check ur email). in that tutorial, one of the things i cover is how to create that gallery (but w/simpler && cleaner CSS/HTML). watch the tutorial && update ur code so that it looks a bit more like the example in my tutorial

SlShannon commented 4 years ago

Thank you Nick, I made new html & css for the about page on the website.

nbriz commented 4 years ago

@SlShannon did u push ur changes? GitHub says ur last updates were 7 days ago

SlShannon commented 4 years ago

Hey Nick,

Yes I had made multiple commit, I will figure out why I am not able to push up to git. I will take a better look at it tonight, because currently I am at work. The About page's HTML and CSS is done, the Home page HTML and CSS code are cleaned and finished designing.

On Tue, Dec 3, 2019 at 10:24 AM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon did u push ur changes? GitHub says ur last updates were 7 days ago

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFHXHF4YSFSDH2FVGETQW2B3ZA5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEFZ6S5A#issuecomment-561244532, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFHPTVXLIEALGFLTLBLQW2B3ZANCNFSM4JR6BB2A .

nbriz commented 4 years ago

ok, leave a comment here when u've pushed updates to ur repo (or let me know if u need help figuring out why it's not getting pushed). but one thing to try (if Atom is giving u trouble pushing) is pushing ur code up via the terminal:

  1. cd into ur repo folder in the terminal
  2. then run git push origin master
nbriz commented 4 years ago

@SlShannon it seems there's a merge conflict here (it's that dang .DS_Store), could u delete all .DS_Store files in ur repo, then commit && push again?

SlShannon commented 4 years ago

Hello Nick,

I tired to delete my .DS_Store, but it won't let me. The .DS_Store is showing up in my Atom, but not in the folder files.

[image: Screen Shot 2019-12-04 at 8.39.50 PM.png]

On Wed, Dec 4, 2019 at 9:56 AM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon it seems there's a merge conflict here (it's that dang .DS_Store), could u delete all .DS_Store files in ur repo, then commit && push again?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFHH6PCEG2FR6W6NC4TQW7HMJA5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEF5PZ4A#issuecomment-561708272, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFFAIY473ZDENC34IBDQW7HMJANCNFSM4JR6BB2A .

SlShannon commented 4 years ago

Here is what my folder looks like

[image: Screen Shot 2019-12-04 at 8.45.21 PM.png]

On Wed, Dec 4, 2019 at 8:42 PM Shannonlewis Z Xu xxu5@saic.edu wrote:

Hello Nick,

I tired to delete my .DS_Store, but it won't let me. The .DS_Store is showing up in my Atom, but not in the folder files.

[image: Screen Shot 2019-12-04 at 8.39.50 PM.png]

On Wed, Dec 4, 2019 at 9:56 AM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon it seems there's a merge conflict here (it's that dang .DS_Store), could u delete all .DS_Store files in ur repo, then commit && push again?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFHH6PCEG2FR6W6NC4TQW7HMJA5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEF5PZ4A#issuecomment-561708272, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFFAIY473ZDENC34IBDQW7HMJANCNFSM4JR6BB2A .

nbriz commented 4 years ago

@SlShannon that's b/c it's a "hidden file", remember that any file that starts with a "." is a hidden file. Atom shows u all the hidden files by default, but finder does not. u can press "CMD + SHIFT + ." in ur finder to toggle show/hide the hidden files.

otherwise u could also delete them with the terminal:

SlShannon commented 4 years ago

Hello Nick,

Yes, after I run the rm .DS_Store, I still have merge conflict.

[image: Screen Shot 2019-12-05 at 6.01.44 PM.png] [image: Screen Shot 2019-12-05 at 5.59.01 PM.png]

On Thu, Dec 5, 2019 at 9:36 AM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon that's b/c it's a "hidden file", remember that any file that starts with a "." is a hidden file. Atom shows u all the hidden files by default, but finder does not. u can press "CMD + SHIFT + ." in ur finder to toggle show/hide the hidden files.

otherwise u could also delete them with the terminal:

  • first cd into ur project folder
  • then run rm .DS_Store
  • && then rm server/.DS_Store

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFFHVTCNODDX3XUVZT3QXENY3A5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGBDVFQ#issuecomment-562182806, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFF6IYTQ5CBVWTE2Q5LQXENY3ANCNFSM4JR6BB2A .

nbriz commented 4 years ago

@SlShannon ok we need to try to resolve this soon b/c @harae37 is waiting on this merge before she can start working on her next part. let's see if we can get on a quick skype (or google hangouts) call sometime tomorrow (Friday) to figure this out. send me an email w/a time that works best for u

SlShannon commented 4 years ago

Hello Nick,

Yes I understand, I believe I have everything completed for the server section, except the fact that I can't not merge my code within the group. I am free after 6 pm tomorrow for google hangout, also I am free on Saturday and Sunday before 2 pm to chat and solve this problem. Thank you for all the help and patience.

Thank you,

Shannon

On Thu, Dec 5, 2019 at 6:42 PM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon ok we need to try to resolve this soon b/c @harae37 https://github.com/harae37 is waiting on this merge before she can start working on her next part. let's see if we can get on a quick skype (or google hangouts) call sometime tomorrow (Friday) to figure this out. send me an email w/a time that works best for u

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFESC2UL3OVHO2PKQKDQXGNWVA5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGCULKI#issuecomment-562382249, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFAHEEIX732HDOID63DQXGNWVANCNFSM4JR6BB2A .

nbriz commented 4 years ago

@SlShannon ok let's meet tonight at 6:15, how's that sound? shouldn't take more than ~15mins

SlShannon commented 4 years ago

Hell Nick,

Are you available right now

On Fri, Dec 6, 2019 at 10:19 AM Nick Briz notifications@github.com wrote:

@SlShannon https://github.com/SlShannon ok let's meet tonight at 6:15, how's that sound? shouldn't take more than ~15mins

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/net-art-and-cultures/data-bodies/pull/39?email_source=notifications&email_token=ANCQXFDAQD3HNREVCVYU5D3QXJ3QPA5CNFSM4JR6BB2KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEGES6UY#issuecomment-562638675, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANCQXFD22MS2PEC5YRAHI5TQXJ3QPANCNFSM4JR6BB2A .