Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@
</nav>

<main>
<section id="home">
<iframe src="https://giphy.com/embed/EA4tMPoqsE6pq" width="600" height="300" frameBorder="0" class="giphy-embed" allowFullScreen></iframe><p><a href="https://giphy.com/gifs/mars-EA4tMPoqsE6pq" alt="gif of Mars, via GIPHY"></a></p>

<section id="home">
<aside style ="background-color:#000">
<iframe src="https://giphy.com/embed/EA4tMPoqsE6pq" width="1000" height="1000" frameBorder="0" class="giphy-embed" allowFullScreen></iframe><a href="https://giphy.com/gifs/mars-EA4tMPoqsE6pq" alt="gif of Mars, via GIPHY"></a>
</aside>

</section>

</section>

<section id="photos">

Expand Down Expand Up @@ -75,10 +79,10 @@
</form>
</fieldset>

<div id="gallery"><!-- this is where images will be appended--></div>
<div id="gallery-wrapper"><!-- this is where images will be appended--></div>


<label for="username">Save your favorite images! Create a username</label>
<label for="username">Create a username to save your favorite images.</label>
<input id = "user" type="text" name="username" required>


Expand All @@ -90,6 +94,7 @@

<form id="getFaves">
<label for="userName">Your Name</label>
<input type="text">
<button id="view" type="submit">View</button>
</form>
</div>
Expand Down
2 changes: 2 additions & 0 deletions styles/layout.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#home {
background-color: #000000;

}


footer{
width: 100%;
margin: 0 auto;
Expand Down
24 changes: 22 additions & 2 deletions styles/module.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@


/* Container module for Gallery */

/*
.flex-container {
display: inline-flex;
flex-direction: row;
Expand Down Expand Up @@ -78,8 +78,28 @@
order: 0;
flex: 0 1 auto;
align-self: auto;
} */
#gallery-wrapper {
position: relative;
display: flex;
justify-content: space-around;
flex-wrap: wrap;
padding: 40px 40px 100px 40px;
}

.imageBlock {
display: block;
position: relative;
width: 25%;
height: 200px;
margin: 20px 0;
padding: 40px;
background-position: center;
background-size: cover;
text-align: center;
border-radius: 20px;
transition: box-shadow .3s ease-in-out;
}

/* LEARN page module */

div.faq_container {
Expand Down
2 changes: 1 addition & 1 deletion views/imageView.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var app = app || {};
e.preventDefault();
app.Image.fetchImages();
})
app.Image.all.map(image => $('#photos').append(image.toHtml()));
app.Image.all.map(image => $('#gallery-wrapper').append(image.toHtml()));

$('.favImage').on('submit', function (event) {
event.preventDefault();
Expand Down