Skip to content

Fix portfolio background #278

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
SaraBMo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix portfolio background #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7489e1
fixes to portfolio layout and background
SaraBMo Dec 5, 2023
ad43182
layout fixes
SaraBMo Dec 6, 2023
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
7 changes: 1 addition & 6 deletions static/core/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ body {
background-color: #ffffff;
font-family: 'Lato', sans-serif;
color: #000000;
overflow-x: hidden;
}

header .collapse {
Expand Down Expand Up @@ -1807,9 +1808,3 @@ ul.open-positions>li {
background-size: cover;
border-radius: 10px;
}

.portfolio-scroll-link
{
display: inline-block;
margin: 0 2em;
}
40 changes: 10 additions & 30 deletions static/core/css/portfolio.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,24 @@
@media (min-width: 768px) {

.portfolio-full {
background-image: url(/static/core/img/img-portfolio-tentacle-right.png),
url(/static/core/img/img-portfolio-tentacle-left.png),
url(/static/core/img/img-portfolio-cube-right.png),
url(/static/core/img/img-portfolio-curl-left.png),
url(/static/core/img/img-portfolio-cloud.png),
url(/static/core/img/img-portfolio-cloud-left.png),
url(/static/core/img/img-portfolio-001.png);
background-position: 100% 35%,
0% 68.5%,
100% 71.5%,
0% 76%,
0% -2%,
0% 3%,
105% -0.5%;
background-image: url(/static/core/img/img-portfolio-tentacle-right.png);

background-position: 100% 35%;


background-repeat: no-repeat;
}
}


@media (max-width: 768px) {
.portfolio-full {
background-image: url(/static/core/img/img-portfolio-tentacle-right.png),
url(/static/core/img/img-portfolio-tentacle-right.png),
url(/static/core/img/img-portfolio-cube-left.png),
url(/static/core/img/img-portfolio-swirly-right.png),
url(/static/core/img/img-portfolio-cloud.png);
background-position: 100% 35%,
100% 65.5%,
0% 69.5%,
100% 73%,
0% -1%;
background-image: url(/static/core/img/img-portfolio-tentacle-right.png);

background-position: 100% 35%;

background-repeat: no-repeat;
background-size: 20%,
20%,
30%,
30%,
100%,
50%;
background-size: 20%;
}
}

Expand Down
81 changes: 21 additions & 60 deletions static/core/css/portfolio/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,116 +1,77 @@
.container-full {
width: 100%;
border-radius: 0px;
margin-bottom: 1rem;
}

article {
overflow-x: hidden;
}

.portfolio-full {

@include smallPhone {
@include background-images(($tentacle-right,
$tentacle-left,
$cube-right,
$curl-left,
@include background-images((
$cloud-full),
(100% 28.5%,
0% 73%,
100% 80.3%,
0% 84.3%,
(
0% -0.5%));
background-size: resizeImage(197px, 471px, 0.35),
resizeImage(197px, 471px, 0.36),
resizeImage(402px, 945px, 0.3),
resizeImage(342px, 323px, 0.35),
background-size:

200%;
}

@include phone {
@include background-images(($tentacle-right,
$tentacle-left,
$cube-right,
$curl-left,
@include background-images((
$cloud-full),
(100% 27%,
0% 72%,
100% 79.5%,
0% 87.5%,
(
0% -2%));
background-size: resizeImage(197px, 471px, 0.6),
resizeImage(197px, 471px, 0.6),
resizeImage(402px, 945px, 0.4),
resizeImage(342px, 323px, 0.4),
background-size:
200%;
}

@include tablet {
@include background-images(($tentacle-right,
$tentacle-left,
$cube-right,
$curl-left,
@include background-images((
$cloud,
$cloud-left,
$main-octopus),
(100% 29%,
0% 74.5%,
100% 80.5%,
0% 85%,
(
0% -2%,
0% 3%,
120% -0.1%,
));
background-size: resizeImage(197px, 471px, 0.8),
resizeImage(197px, 471px, 0.8),
resizeImage(402px, 945px, 0.5),
resizeImage(342px, 323px, 0.6),
background-size:
auto,
auto,
resizeImage(595px, 842px, 0.80);
}

@include smallDesktop {
@include background-images(($tentacle-right,
$tentacle-left,
$cube-right,
$curl-left,
@include background-images((
$cloud,
$cloud-left,
$main-octopus),
(100% 27.5%,
0% 68.5%,
100% 75.5%,
0% 81.1%,
(
0% -2%,
0% 3%,
120% -0.1%,
));
background-size: resizeImage(197px, 471px, 0.8),
resizeImage(197px, 471px, 0.8),
resizeImage(402px, 945px, 0.6),
resizeImage(342px, 323px, 0.6),
background-size:
auto,
auto,
resizeImage(595px, 842px, 0.95);
}

@include desktop {
@include background-images(($tentacle-right,
$tentacle-left,
$cube-right,
$curl-left,
@include background-images((
$cloud,
$cloud-left,
$main-octopus),
(100% 27%,
0% 68%,
100% 75.5%,
0% 80.8%,
(
0% -2%,
0% 3%,
107% -0.3%,
));
background-size: resizeImage(197px, 471px, 0.8),
resizeImage(197px, 471px, 0.8),
resizeImage(402px, 945px, 0.6),
resizeImage(342px, 323px, 0.6),
background-size:
auto,
auto,
resizeImage(595px, 842px, 1.1);
Expand Down
15 changes: 14 additions & 1 deletion static/core/css/portfolio/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

.scroll-down {
padding: 5rem 0;
padding: 6rem 0;
text-decoration: none;

span,
Expand All @@ -24,6 +24,19 @@
font-size: 18px;
font-weight: normal;
}

a {
display: inline-block;
margin: 1em;
}

@include media(smallPhone, phone) {
padding: 1rem 0;
}

@include media(desktop) {
padding: 8rem 0;
}
}

@include media(smallPhone, phone) {
Expand Down
2 changes: 1 addition & 1 deletion static/core/css/portfolio/_main-container.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* General */
.portfolio-container {
margin-bottom: 8rem;
margin-bottom: 7rem;

@include media(smallPhone, phone) {
margin-bottom: 4rem;
Expand Down
Loading