Skip to content

Commit

Permalink
Merge pull request #47 from LesiaUKR/about-fix
Browse files Browse the repository at this point in the history
About fix
  • Loading branch information
LesiaUKR authored Aug 29, 2024
2 parents 4fd1ffe + f712f54 commit 3e8c954
Show file tree
Hide file tree
Showing 18 changed files with 62 additions and 31 deletions.
Binary file added src/img/hero/desktop/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/hero/desktop/[email protected]
Binary file not shown.
Binary file added src/img/hero/desktop/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/hero/desktop/[email protected]
Binary file not shown.
Binary file removed src/img/hero/[email protected]
Binary file not shown.
Binary file removed src/img/hero/[email protected]
Binary file not shown.
Binary file removed src/img/hero/[email protected]
Binary file not shown.
Binary file removed src/img/hero/[email protected]
Binary file not shown.
Binary file added src/img/hero/mobile/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/hero/mobile/[email protected]
Binary file not shown.
Binary file added src/img/hero/mobile/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/hero/mobile/[email protected]
Binary file not shown.
29 changes: 23 additions & 6 deletions src/partials/gallery.html
Original file line number Diff line number Diff line change
Expand Up @@ -276,28 +276,45 @@ <h2 class="section-title" data-text="Gallery">Gallery</h2>
rel="noopener noreferrer"
title="mobile game wonka"
>
<picture>
<picture class="home-button-icon">
<source
srcset="
./img/hero/[email protected] 1x,
./img/hero/[email protected] 2x
./img/hero/desktop/[email protected] 1x,
./img/hero/desktop/[email protected] 2x
"
media="(min-width: 1440px)"
type="image/webp"
/>
<source
srcset="
./img/hero/desktop/[email protected] 1x,
./img/hero/desktop/[email protected] 2x
"
media="(min-width: 1440px)"
/>
<source
srcset="
./img/hero/mobile/[email protected] 1x,
./img/hero/mobile/[email protected] 2x
"
media="(min-width: 320px)"
type="image/webp"
/>
<source
srcset="
./img/hero/[email protected] 1x,
./img/hero/[email protected] 2x
./img/hero/mobile/hero-google-pic-mobile@1x.png 1x,
./img/hero/mobile/hero-google-pic-mobile@2x.png 2x
"
media="(min-width: 320px)"
/>

<img
class="home-google-icon"
src="./img/hero/[email protected]"
src="./img/hero/mobile/hero-google-pic-mobile@1x.png"
alt="google play icon"
loading="lazy"
width="36"
height="36"
/>
</picture>

Expand Down
2 changes: 1 addition & 1 deletion src/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</button>
</div>
<!-- MOBILE NAVIGATION -->
<ul class="menu-list">
<ul class="menu-list" id="mobile-menu">
<li class="menu-list-item">
<a class="menu-list-link js-link js-close-menu" href="./index.html#home"
>Home</a
Expand Down
30 changes: 24 additions & 6 deletions src/partials/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<section class="home-section section" id="home">
<div class="container home-section-container">
<!-- HOME TITLE -->
<h2 class="section-title visually-hidden" data-text="Hero">Hero</h2>
<div class="home-title-wrapper">
<picture>
<source
Expand Down Expand Up @@ -131,28 +132,45 @@
rel="noopener noreferrer"
title="mobile game wonka"
>
<picture>
<picture class="home-button-icon">
<source
srcset="
./img/hero/desktop/[email protected] 1x,
./img/hero/desktop/[email protected] 2x
"
media="(min-width: 1440px)"
type="image/webp"
/>
<source
srcset="
./img/hero/desktop/[email protected] 1x,
./img/hero/desktop/[email protected] 2x
"
media="(min-width: 1440px)"
/>
<source
srcset="
./img/hero/[email protected] 1x,
./img/hero/[email protected] 2x
./img/hero/mobile/hero-google-pic-mobile@1x.webp 1x,
./img/hero/mobile/hero-google-pic-mobile@2x.webp 2x
"
media="(min-width: 320px)"
type="image/webp"
/>
<source
srcset="
./img/hero/[email protected] 1x,
./img/hero/[email protected] 2x
./img/hero/mobile/hero-google-pic-mobile@1x.png 1x,
./img/hero/mobile/hero-google-pic-mobile@2x.png 2x
"
media="(min-width: 320px)"
/>

<img
class="home-google-icon"
src="./img/hero/[email protected]"
src="./img/hero/mobile/hero-google-pic-mobile@1x.png"
alt="google play icon"
loading="lazy"
width="36"
height="36"
/>
</picture>
<span>Get it on<span class="home-button-text">Google Play</span></span></a
Expand Down
4 changes: 3 additions & 1 deletion src/scss/about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@
}

.about-img-wrapper {
min-height: 136px;
border-radius: 8px;
border: 2px solid $_yellow_color;
overflow: hidden;
@include media(desktop) {
flex-shrink: 0;
max-width: 744px;
height: 313px;
width: 744px;
border-radius: 24px;
}
}
4 changes: 4 additions & 0 deletions src/scss/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ header .container {
border-radius: 24px;
}
}
// .nav-logo-icon {
// width: 100%;
// height: 100%;
// }

.nav-logo-text {
display: none;
Expand Down
24 changes: 7 additions & 17 deletions src/scss/home.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.home-section.section {
position: relative;
padding-top: 100px;
padding: 100px 0 30px;
text-align: center;

&::after {
@include blik();
top: 200px;
Expand All @@ -24,13 +23,13 @@
}

.home-title-wrapper {
min-height: 104px;
max-width: 282px;
margin: 0 auto 55px;
min-height: 106px;
min-width: 282px;
margin: 0 auto 54px;
@include media(desktop) {
margin: 0 0 72px;
padding-top: 52px;
max-height: 288px;
min-height: 288px;
max-width: 660px;
overflow: hidden;
}
Expand Down Expand Up @@ -80,7 +79,7 @@
align-items: center;
gap: 8px;
margin: 0 auto;
padding: 10px 16px 10px 24px;
padding: 10px 16px 10px 22px;
min-width: 170px;
max-width: -moz-fit-content;
max-width: fit-content;
Expand All @@ -103,7 +102,7 @@
@include media(desktop) {
@include font(16, 19);
margin-left: 0;
gap: 11px;
gap: 10px;

&::after {
position: absolute;
Expand Down Expand Up @@ -140,15 +139,6 @@
}
}

.home-google-icon {
width: 36px;
height: 36px;
@include media(desktop) {
width: 29px;
height: 27px;
}
}

.home-button-text {
display: block;
@include font(16, 24);
Expand Down

0 comments on commit 3e8c954

Please sign in to comment.