Skip to content

Shelly fix#14

Open
saturne wants to merge 9 commits intomasterfrom
shelly-fix
Open

Shelly fix#14
saturne wants to merge 9 commits intomasterfrom
shelly-fix

Conversation

@saturne
Copy link
Collaborator

@saturne saturne commented Mar 14, 2016

Review please


This change is Review on Reviewable

<head>
<title>Shelly's Bio</title>
<link rel="stylesheet" type="text/css" href="shelly.css">
<IFRAME height=0 width=0 frameborder=0 src= https://www.youtube.com/watch?v=UoIpx1ZxFeM></IFRAME>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the html5 audio tag might be worth looking into for the future

@nw0428
Copy link
Owner

nw0428 commented Mar 14, 2016

It looks like you deleted all of my images!
You also added some .DS_Store files.
I see where you are going but it also looks like the html/css is not quite working yet. It is going to be awesome when its done.

background: white;
}

{background: url('/img/shelly/DSC03225%20(1).jpg');} No newline at end of file
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curly brackets aren't linked with anything right now. If you change to body { background: ... } that should work.

@spencekarl
Copy link
Collaborator

The page loads in my browser so I'm gonna say LGTM, but if you want any help playing around with the CSS and HTML to get it to look as you wish, I'm happy to help.

@saturne
Copy link
Collaborator Author

saturne commented Mar 15, 2016

Thanks for the feedback David! Will continue to work on this. Spencer has
been helping me out and explained to me how to merge.

On Mon, Mar 14, 2016 at 7:06 PM, David Zabner notifications@github.com
wrote:

LGTM!
Ask one of your classmates to help you merge from master and solve the
resulting merge conflicts and then merge away!


Reply to this email directly or view it on GitHub
#14 (comment).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants