Skip to content

peoples/section/rebased #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zainaboyedeji wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

peoples/section/rebased #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecc7d07
peoples/section/rebased
Oct 2, 2019
d09e3a1
peoples/section/rebased
Oct 2, 2019
a4a2eb6
peoples/section/correction
Oct 3, 2019
b30e8e8
resolve-conflict
Oct 3, 2019
af719aa
resolve/peoplesconflict
Oct 3, 2019
7978c2e
peoples-section-rearrangement
Oct 4, 2019
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
76 changes: 47 additions & 29 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,27 +1629,28 @@ u {
display: grid;
grid-template-columns: repeat(3, 1fr);
margin-top: -15rem;
margin-left: 5rem; }
margin-left: 7rem; }
.grid .item1 {
margin-top: 24rem;
margin-left: 3rem; }
margin-left: 6rem; }
.grid .item2 {
margin-top: 19rem;
margin-left: -0.7rem; }
margin-left: -4rem; }
.grid .item3 {
margin-left: -15rem; }
margin-left: -23rem; }
.grid .item4 {
margin-left: 8rem; }
margin-left: 11rem;
margin-top: 0.5rem; }
.grid .item5 {
margin-top: -11rem;
margin-left: -0.5rem; }
margin-top: -10.5rem;
margin-left: -3.8rem; }
.grid .item6 {
margin-top: -11rem;
margin-left: 0.5rem; }
margin-top: -10.5rem;
margin-left: -7.5rem; }

.item7 {
margin-left: 59rem;
margin-top: -20rem; }
margin-left: 65rem;
margin-top: -19.5rem; }

@media (max-width: 580px) {
.grid {
Expand All @@ -1661,29 +1662,46 @@ u {
.peoples-media {
display: block; } }

.peoples-media-grid {
@media (max-width: 768px) {
.grid {
display: none; }
.item7 {
display: none; }
.footer-writeup {
display: none; }
.peoples-media {
display: block; } }

.peoples-media .peoples-media-writeup {
margin-top: 2rem;
margin-left: 15rem;
margin-bottom: 2.5rem; }

.peoples-media .peoples-media-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
margin-top: 2rem;
overflow: hidden; }
.peoples-media-grid .item-1-media {
margin-left: 4rem;
margin-top: 5rem; }
.peoples-media-grid .item-2-media {
.peoples-media .peoples-media-grid .item-1-media {
margin-left: 12.5rem;
margin-top: 5rem; }
.peoples-media-grid .item-3-media {
margin-left: -2.5rem; }
.peoples-media-grid .item-4-media {
margin-left: 7rem; }
.peoples-media-grid .item-5-media {
margin-top: -3rem; }
.peoples-media-grid .item-6-media {
margin-top: -3rem;
margin-right: 8rem; }

.item-7-media {
margin-left: 18.8rem;
margin-top: -5rem; }
.peoples-media .peoples-media-grid .item-2-media {
margin-top: 5.2rem; }
.peoples-media .peoples-media-grid .item-3-media {
margin-left: -3rem;
margin-top: 0.5rem; }
.peoples-media .peoples-media-grid .item-4-media {
margin-left: 15.7rem;
margin-top: 0.1rem; }
.peoples-media .peoples-media-grid .item-5-media {
margin-top: -2.5rem; }
.peoples-media .peoples-media-grid .item-6-media {
margin-top: -2.5rem;
margin-right: 15rem; }

.peoples-media .item-7-media {
margin-left: 27.2rem;
margin-top: -4.5rem; }

*,
*:before,
Expand Down
2 changes: 2 additions & 0 deletions pages/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ <h1 class="mobileSection__header2">Know when to buy</h1>
</div>
</div>



<!--The Features Sections-->

<div class="container">
Expand Down
80 changes: 43 additions & 37 deletions pages/people.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,54 @@
<div data-include='header'></div>
<div class="footer-writeup">

<p style="margin-top:12rem;margin-left:10rem;">The people behind the bunny</p>
<h1 style="margin-left:10rem;margin-top:1rem;">"Hopper is a culture of</br>makers.We build things"</h1>
<p style="margin-left:10rem;margin-top:1rem;">Joost Owerenest, CTO</p>
</div>
<div class="grid">


<div class="item1"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532778/samples/zainabs/g0c8l1h7sfbk7cfyo9uy.png" alt="" style="width:22rem;height:18rem;" ></div>

<div class="item2"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532821/samples/zainabs/a4719narskqef0vbc0p2.png" alt="" style="width:13rem;height:12rem;" ></div>
<div class="item3"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532869/samples/zainabs/lsytskpvsc1bu1xnxswz.png" alt=""></div>
<div class="item4"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532789/samples/zainabs/vi3s3cjf7mywvkdqrxl6.png" alt="" style="width:17rem;height:15rem;" ></div>
<div class="item5"> <img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532864/samples/zainabs/enxliolo9ot26neyb9jz.png" alt="" style="width:28rem;height:35rem;"></div>
<div class="item6"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569432777/samples/new%20folder/b9gtf0pytjcj3sblgdux.png" alt="" style="width:16rem;height:15rem;"></div>


<p style="margin-top:12rem;margin-left:10rem;">The people behind the bunny</p>
<h1 style="margin-left:10rem;margin-top:1rem;">"Hopper is a culture of</br>makers.We build things"</h1>
<p style="margin-left:10rem;margin-top:1rem;">Joost Owerenest, CTO</p>
</div>
<div class="grid">


<div class="item1"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532778/samples/zainabs/g0c8l1h7sfbk7cfyo9uy.png" alt="" style="width:22rem;height:18rem;" ></div>

<div class="item2"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532821/samples/zainabs/a4719narskqef0vbc0p2.png" alt="" style="width:13rem;height:12rem;" ></div>
<div class="item3"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532869/samples/zainabs/lsytskpvsc1bu1xnxswz.png" alt=""></div>

</div>
<div class="item7"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532802/samples/zainabs/xp42b9u1ml5uvwb3zlir.png" alt="" style="width:15rem;height:15rem;"></div>

<div class="peoples-media">
<div style="margin-top:2rem;margin-left:7rem;margin-bottom:2.5rem;">
<p>The people behind the bunny</p>
<h1>"We dont want to </br>optimize; we want to </br>change the world."</h1>
<p>Maggie,Product Designer.</p>


<div class="item4"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532789/samples/zainabs/vi3s3cjf7mywvkdqrxl6.png" alt="" style="width:17rem;height:15rem;" ></div>
<div class="item5"> <img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532864/samples/zainabs/enxliolo9ot26neyb9jz.png" alt="" style="width:28rem;height:35rem;"></div>
<div class="item6"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532884/samples/zainabs/a6xbpakvlngtgmmqtkap.png" alt="" style="width:16rem;height:15rem;"></div>


</div>
<div class="item7"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569532802/samples/zainabs/xp42b9u1ml5uvwb3zlir.png" alt="" style="width:15rem;height:15rem;"></div>



<img style="margin-left:14rem;" src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569505351/samples/figma%20people/jmef88phxs49jjvphmil.png" alt="">
<div class="peoples-media-grid">
<div class="item-1-media"><img style="width:8rem;" src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504680/samples/figma%20people/wkqqdalk0c93agx7bk2a.png" alt=""></div>
<div class="item-2-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504704/samples/figma%20people/iysfnyunmqvnyup9hjxr.png" alt=""></div>
<div class="item-3-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504728/samples/figma%20people/abu6ierylfnsrzbceekn.png" alt=""></div>
<div class="item-4-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504686/samples/figma%20people/gtsmpoclevpsjisubb9m.png" alt=""></div>
<div class="item-5-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504715/samples/figma%20people/gmulenmtoxww8uvcxzyh.png" alt=""></div>
<div class="item-6-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504737/samples/figma%20people/ywylzqftoy9nsrc6fvld.png" alt=""></div>


</div>
<div class="peoples-media">
<div class="peoples-media-writeup">
<p>The people behind the bunny</p>
<h1>"We dont want to </br>optimize; we want to </br>change the world."</h1>
<p>Maggie,Product Designer.</p>
</div>

<img style="margin-left:22rem;" src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569505351/samples/figma%20people/jmef88phxs49jjvphmil.png" alt="">
<div class="peoples-media-grid">
<div class="item-1-media"><img style="width:8rem;" src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504680/samples/figma%20people/wkqqdalk0c93agx7bk2a.png" alt=""></div>
<div class="item-2-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504704/samples/figma%20people/iysfnyunmqvnyup9hjxr.png" alt=""></div>
<div class="item-3-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504728/samples/figma%20people/abu6ierylfnsrzbceekn.png" alt=""></div>
<div class="item-4-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504686/samples/figma%20people/gtsmpoclevpsjisubb9m.png" alt=""></div>
<div class="item-5-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504715/samples/figma%20people/gmulenmtoxww8uvcxzyh.png" alt=""></div>
<div class="item-6-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504737/samples/figma%20people/ywylzqftoy9nsrc6fvld.png" alt=""></div>

<div class="item-7-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504695/samples/figma%20people/fqz4qyaq13xiz9ogwhj1.png" alt=""></div>

</div>
</div>


<div class="item-7-media"><img src="https://res.cloudinary.com/dtbjhs8a6/image/upload/v1569504695/samples/figma%20people/fqz4qyaq13xiz9ogwhj1.png" alt=""></div>

</div>

<div class="container">
<div class="row">
<div class="col-lg-6 peopleSection">
Expand Down Expand Up @@ -219,8 +222,11 @@ <h1 class="mobilePeopleSection__header">Hopper's core values</h1>
</div>
</div>

>>>>>>> d09e3a1a3ef3d2d771b2683fa591b0bf81abffb8

</div>


<div class="flex-container">
<div id="flex-item-1">
<h2>Assorted Hopper Humans</h2>
Expand Down
Loading