diff --git a/css/main.css b/css/main.css
index 6aaf854..701ccde 100644
--- a/css/main.css
+++ b/css/main.css
@@ -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 {
@@ -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,
diff --git a/pages/home.html b/pages/home.html
index f839bc0..6cbfae5 100644
--- a/pages/home.html
+++ b/pages/home.html
@@ -78,6 +78,8 @@
+
+
diff --git a/pages/people.html b/pages/people.html
index 304445d..4b7a148 100644
--- a/pages/people.html
+++ b/pages/people.html
@@ -15,51 +15,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
The people behind the bunny
+
"Hopper is a culture ofmakers.We build things"
+
Joost Owerenest, CTO
+
+
-
-
-
+
+>>>>>>> d09e3a1a3ef3d2d771b2683fa591b0bf81abffb8
+
+
Assorted Hopper Humans
diff --git a/scss/pages/_people.scss b/scss/pages/_people.scss
index 19e6369..a7d18cb 100644
--- a/scss/pages/_people.scss
+++ b/scss/pages/_people.scss
@@ -7,100 +7,118 @@
}
}
}
-.peoples-media{
- display:none;
-}
-
-.grid{
- display:grid;
- grid-template-columns: repeat(3,1fr);
- margin-top: -15rem;
- margin-left: 5rem;
-
-.item1{
- margin-top:24rem;
- margin-left:3rem;
-}
-
-.item2{
- margin-top:19rem;
- margin-left:-0.7rem;
-}
-
-.item3{
- margin-left: -15rem;
-}
-.item4{
- margin-left: 8rem;
-}
-
-.item5{
-margin-top: -11rem;
-margin-left:-0.5rem;
-}
-
-.item6{
- margin-top: -11rem;
- margin-left:0.5rem;
-
-}
-
-
-
+.peoples-media {
+ display: none;
}
+.grid {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ margin-top: -15rem;
+ margin-left: 7rem;
+ .item1 {
+ margin-top: 24rem;
+ margin-left: 6rem;
+ }
+ .item2 {
+ margin-top: 19rem;
+ margin-left: -4rem;
+ }
+ .item3 {
+ margin-left: -23rem;
+ }
+ .item4 {
+ margin-left: 11rem;
+ margin-top:0.5rem;
+ }
+ .item5 {
+ margin-top: -10.5rem;
+ margin-left:-3.8rem;
+ }
+ .item6 {
+ margin-top: -10.5rem;
+ margin-left: -7.5rem;
+ }
-.item7{
- margin-left:59rem;
- margin-top: -20rem;
-}
+ }
-@media(max-width:580px){
- .grid{
- display:none;
+ .item7 {
+ margin-left: 65rem;
+ margin-top: -19.5rem;
+ }
+
+ @media(max-width:580px) {
+ .grid {
+ display: none;
}
- .item7{
- display:none;
+ .item7 {
+ display: none;
}
- .footer-writeup{
- display:none;
+ .footer-writeup {
+ display: none;
}
- .peoples-media{
- display:block;
+ .peoples-media {
+ display: block;
}
-}
-
-
-.peoples-media-grid{
- display:grid;
- grid-template-columns: repeat(3,1fr);
- margin-top:2rem;
- overflow:hidden;
- .item-1-media{margin-left:4rem;
- margin-top:5rem;
+ }
+
+ @media(max-width:768px) {
+ .grid {
+ display: none;
}
- .item-2-media{
- margin-top:5rem;
+ .item7 {
+ display: none;
}
- .item-3-media{margin-left:-2.5rem;
+ .footer-writeup {
+ display: none;
}
- .item-4-media{margin-left:7rem;
+ .peoples-media {
+ display: block;
}
- .item-5-media{margin-top:-3rem;
+ }
+
+ .peoples-media {
+ .peoples-media-writeup {
+ margin-top: 2rem;
+ margin-left: 15rem;
+ margin-bottom: 2.5rem
}
- .item-6-media{margin-top:-3rem;
- margin-right:8rem;
+ .peoples-media-grid {
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ margin-top: 2rem;
+ overflow: hidden;
+ .item-1-media {
+
+ margin-left: 12.5rem;
+ margin-top: 5rem;
+ }
+ .item-2-media {
+ margin-top: 5.2rem;
+ }
+ .item-3-media {
+ margin-left: -3rem;
+ margin-top: 0.5rem;
+ }
+ .item-4-media {
+ margin-left: 15.7rem;
+ margin-top:0.1rem;
+ }
+ .item-5-media {
+ margin-top: -2.5rem;
+ }
+ .item-6-media {
+ margin-top: -2.5rem;
+ margin-right: 15rem;
+ }
}
+ .item-7-media {
+ margin-left: 27.2rem;
+ margin-top: -4.5rem;
+ }
+ }
+
-
-
-}
-
-.item-7-media{
- margin-left:18.8rem;
- margin-top:-5rem;
-}
-
*,
*:before,
*:after {