Skip to content
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

start dev #1

Open
wants to merge 60 commits into
base: main
Choose a base branch
from
Open

start dev #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
0809050
start dev
restby Jul 3, 2024
f4c7f17
start dev header
restby Jul 3, 2024
8ba8249
header,add img,fonts,some settings files
restby Jul 3, 2024
5adbfa6
about,section-title,video,add some img
restby Jul 3, 2024
d83a922
start dev price
restby Jul 3, 2024
6322ee7
some edits,price-card,some fix
restby Jul 3, 2024
34ef29a
end dev price
restby Jul 4, 2024
ed7401c
some fix price
restby Jul 4, 2024
bf6b7b3
start PP edits
restby Jul 4, 2024
6aba389
many fixes
restby Jul 4, 2024
39b71cc
fix hero,games
restby Jul 4, 2024
a21c40a
fix PP, end games
restby Jul 4, 2024
615b192
start dev juri
restby Jul 4, 2024
827da94
end juri,some fixes
restby Jul 5, 2024
2589ec1
start dev features
restby Jul 5, 2024
899f3f2
dev features
restby Jul 5, 2024
b503a8f
end features
restby Jul 6, 2024
025dd5f
start dev offers
restby Jul 6, 2024
f1d6887
end offers, some fix btn,feature-card,feature,price-card-hero-juri
restby Jul 8, 2024
1878665
start dev faq
restby Jul 8, 2024
0b5aadc
faq,many PP fixes,colors edits
restby Jul 9, 2024
bceeabc
some fixes
restby Jul 10, 2024
1b0297d
end faq, PP fixes
restby Jul 10, 2024
5369d53
start reviews
restby Jul 10, 2024
0e1f680
end reviews,some fixes
restby Jul 10, 2024
7f3d481
start form
restby Jul 10, 2024
a884cb4
sove fixes
restby Jul 10, 2024
6de6e5f
test fixes
restby Jul 10, 2024
d2bbb2d
many fixes
restby Jul 11, 2024
b6d9416
fa-ing PP
restby Jul 13, 2024
e3489d3
near end
restby Jul 13, 2024
7cbf83b
page-footer, many fixes
restby Jul 15, 2024
9bd8ecc
some fix
restby Jul 15, 2024
c27638f
many fixes js
restby Jul 15, 2024
8390fb6
end fixes
restby Jul 16, 2024
f84f01a
test-fixes
restby Jul 16, 2024
28ce6e0
end form-validate
restby Jul 16, 2024
7f070e7
end
restby Jul 16, 2024
7133bb2
editorconfig fix
restby Jul 16, 2024
7a27d04
fix images,favicons
restby Jul 16, 2024
906b710
fonts preload
restby Jul 16, 2024
b8cce3d
snow
restby Jul 17, 2024
541bba7
editorconfig
restby Jul 17, 2024
18e27d9
good after all tests
restby Jul 17, 2024
e7c4e00
many fixes
restby Jul 17, 2024
e9d8520
all test fix
restby Jul 17, 2024
b34d981
fix bg-sizes
restby Jul 17, 2024
f6d06a6
fix images
restby Jul 17, 2024
30e9daa
fix image bg
restby Jul 17, 2024
ff6debd
interactive
restby Jul 17, 2024
eb48731
fix some criteria
restby Jul 17, 2024
217df11
end criterias
restby Jul 17, 2024
b490eac
lazy
restby Jul 17, 2024
0011aa9
all test, some fixes
restby Jul 18, 2024
914b17a
part 1
restby Jul 19, 2024
94ecee6
feature fix
restby Jul 19, 2024
4ac0e34
end all of test, end criteria
restby Jul 19, 2024
e8044ef
end all
restby Jul 20, 2024
4e5296a
fix favicon
restby Jul 24, 2024
be7129c
last
restby Aug 5, 2024
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
Prev Previous commit
Next Next commit
fix images
  • Loading branch information
@restby
restby committed Jul 17, 2024
commit f6d06a62527a4fe4c3a810d9bfa77778119ef896
0 source/img/action-desktop2x.jpg → source/img/action-desktop@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/action-desktop2x.webp → source/img/action-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/action-mobile2x.jpg → source/img/action-mobile@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/action-mobile2x.webp → source/img/action-mobile@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/action-tablet2x.jpg → source/img/action-tablet@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/action-tablet2x.webp → source/img/action-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/avatar2x.png → source/img/avatar@2x.png
View file
Open in desktop
File renamed without changes
0 source/img/avatar2x.webp → source/img/avatar@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/decor-desktop2x.png → source/img/decor-desktop@2x.png
View file
Open in desktop
File renamed without changes
0 source/img/decor-desktop2x.webp → source/img/decor-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/decor-tablet2x.png → source/img/decor-tablet@2x.png
View file
Open in desktop
File renamed without changes
0 source/img/decor-tablet2x.webp → source/img/decor-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/games-desktop2x.jpg → source/img/games-desktop@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/games-desktop2x.webp → source/img/games-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/games-mobile2x.jpg → source/img/games-mobile@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/games-mobile2x.webp → source/img/games-mobile@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/games-tablet2x.jpg → source/img/games-tablet@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/games-tablet2x.webp → source/img/games-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/gym-desktop2x.jpg → source/img/gym-desktop@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/gym-desktop2x.webp → source/img/gym-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/gym-mobile2x.jpg → source/img/gym-mobile@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/gym-mobile2x.webp → source/img/gym-mobile@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/gym-tablet2x.jpg → source/img/gym-tablet@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/gym-tablet2x.webp → source/img/gym-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/hero-desktop2x.jpg → source/img/hero-desktop@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/hero-desktop2x.webp → source/img/hero-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/hero-tablet2x.jpg → source/img/hero-tablet@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/hero-tablet2x.webp → source/img/hero-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/video-preview-desktop2x.jpg → source/img/video-preview-desktop@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/video-preview-desktop2x.webp → source/img/video-preview-desktop@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/video-preview-mobile2x.jpg → source/img/video-preview-mobile@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/video-preview-mobile2x.webp → source/img/video-preview-mobile@2x.webp
View file
Open in desktop
File renamed without changes.
0 source/img/video-preview-tablet2x.jpg → source/img/video-preview-tablet@2x.jpg
View file
Open in desktop
File renamed without changes
0 source/img/video-preview-tablet2x.webp → source/img/video-preview-tablet@2x.webp
View file
Open in desktop
File renamed without changes.
91 changes: 39 additions & 52 deletions source/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>SUPERGYM</title>
<link rel="icon" href="favicon.ico">
Expand Down Expand Up @@ -48,19 +49,14 @@ <h1>ФИТНЕС ЦЕНТР</h1>
</div>
<div class="hero__col hero__col--img">
<picture>
<!-- desktop -->
<source type="image/webp" media="(min-width: 1365px)" width="500" height="524"
srcset="img/hero-desktop.webp 1x, img/hero-desktop@2x.webp 2x">
<!-- tablet -->
<source type="image/webp" media="(min-width: 767px)" width="324" height="390"
srcset="img/hero-tablet.webp 1x, img/hero-desktop@2x.webp 2x">
<!-- desktop -->
<source type="image/webp" media="(min-width: 1365px)" width="500" height="524"
srcset="img/hero-desktop.jpg 1x, img/hero-desktop@2x.jpg 2x">
<!-- tablet -->
<source type="image/webp" media="(min-width: 767px)" width="324" height="390"
srcset="img/hero-tablet.jpg 1x, img/hero-desktop@2x.jpg 2x">
<source type="image/webp" media="(min-width: 768px) and (max-width: 1365px)" width="324" height="390"
srcset="img/hero-tablet.webp 1x, img/hero-tablet@2x.webp 2x">
<source type="image/jpeg" media="(min-width: 768px) and (max-width: 1365px)" width="324" height="390"
srcset="img/hero-tablet.jpg 1x, img/hero-tablet@2x.jpg 2x">
<!-- desktop -->
<source type="image/webp" media="(min-width: 1366px)" width="500" height="524"
srcset="img/hero-desktop.webp 1x, img/hero-desktop@2x.webp 2x">
<img width="500" height="524" src="img/hero-desktop.jpg" srcset="img/hero-desktop@2x.jpg 2x"
alt="Мужчина, в спортивной темной майке с логотипом на груди в виде буквы S.">
</picture>
Expand Down Expand Up @@ -95,49 +91,43 @@ <h2 class="about__title section-title section-title--dark">
</div>
<div class="about__col about__col--img">
<picture>
<!-- desktop -->
<source width="660" height="400" type="image/webp" media="(min-width: 1365px)"
srcset="img/gym-desktop.webp 1x, img/gym-desktop@2x.webp 2x">
<!-- tablet -->
<source width="678" height="345" type="image/webp" media="(min-width: 767px)"
srcset="img/gym-tablet.webp 1x, img/gym-tablet@2x.webp 2x">
<!-- mobile -->
<source width="320" height="280" type="image/webp" media="(max-width: 767px)"
srcset="img/gym-mobile.webp 1x, img/gym-mobile@2x.webp 2x">
<source width="320" height="280" type="image/jpeg" media="(max-width: 767px)"
srcset="img/gym-mobile.jpg 1x, img/gym-mobile@2x.jpg 2x">
<!-- tablet -->
<source width="678" height="345" type="image/webp" media="(min-width: 767px)"
<source width="678" height="345" type="image/webp" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/gym-tablet.webp 1x, img/gym-tablet@2x.webp 2x">
<source width="678" height="345" type="image/jpeg" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/gym-tablet.jpg 1x, img/gym-tablet@2x.jpg 2x">
<!-- mobile -->
<source width="320" height="280" type="image/webp" media="(max-width: 767px)"
srcset="img/gym-mobile.jpg 1x, img/gym-mobile@2x.jpg 2x">
<!-- desktop -->
<source width="660" height="400" type="image/webp" media="(min-width: 1366px)"
srcset="img/gym-desktop.webp 1x, img/gym-desktop@2x.webp 2x">
<img width="660" height="400" src="img/gym-desktop.jpg" srcset="img/gym-desktop@2x.jpg 2x"
alt="зал со спортивными тренажерами.">
</picture>

</div>
<div class="about__video">
<div class="video" data-id="video" data-src="https://www.youtube.com/embed/9TZXsZItgdw?autoplay=1">
<picture>
<!-- desktop -->
<source width="360" height="230" type="image/webp" media="(min-width: 1365px)"
srcset="img/video-preview-desktop.webp 1x, img/video-preview-desktop@2x.webp 2x">
<!-- tablet -->
<source width="270" height="170" type="image/webp" media="(min-width: 767px)"
srcset="img/video-preview-tablet.webp 1x, img/video-preview-tablet@2x.webp 2x">
<!-- mobile -->
<source width="320" height="170" type="image/webp" media="(max-width: 767px)"
srcset="img/video-preview-mobile.webp 1x, img/video-preview-mobile@2x.webp 2x">
<source width="320" height="170" type="image/jpeg" media="(max-width: 767px)"
srcset="img/video-preview-mobile.jpg 1x, img/video-preview-mobile@2x.jpg 2x">
<!-- tablet -->
<source width="270" height="170" type="image/webp" media="(min-width: 767px)"
<source width="270" height="170" type="image/webp" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/video-preview-tablet.webp 1x, img/video-preview-tablet@2x.webp 2x">
<source width="270" height="170" type="image/jpeg" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/video-preview-tablet.jpg 1x, img/video-preview-tablet@2x.jpg 2x">
<!-- mobile -->
<source width="320" height="170" type="image/webp" media="(max-width: 767px)"
srcset="img/video-preview-mobile.jpg 1x, img/video-preview-mobile@2x.jpg 2x">
<!-- desktop -->
<source width="360" height="230" type="image/webp" media="(min-width: 1366px)"
srcset="img/video-preview-desktop.webp 1x, img/video-preview-desktop@2x.webp 2x">
<img width="360" height="230" src="img/video-preview-desktop.jpg"
srcset="img/video-preview-desktop@2x.jpg 2x" alt="зал с тренажерами.">
</picture>

<button class="video__btn" type="button">
<span class="visually-hidden">play</span>
</button>
Expand Down Expand Up @@ -370,22 +360,20 @@ <h2 class="games__tile section-title section-title--light">
</div>
<div class="games__col games__col--img">
<picture>
<!-- desktop -->
<source width="660" height="500" type="image/webp" media="(min-width: 1365px)"
srcset="img/games-desktop.webp 1x, img/games-desktop@2x.webp 2x">
<!-- tablet -->
<source width="378" height="348" type="image/webp" media="(min-width: 767px)"
srcset="img/games-tablet.webp 1x, img/games-tablet@2x.webp 2x">
<!-- mobile -->
<source width="290" height="290" type="image/webp" media="(max-width: 767px)"
srcset="img/games-mobile.webp 1x, img/games-mobile@2x.webp 2x">
<source width="290" height="290" type="image/jpeg" media="(max-width: 767px)"
srcset="img/games-mobile.jpg 1x, img/games-mobile@2x.jpg 2x">
<!-- tablet -->
<source width="378" height="348" type="image/webp" media="(min-width: 767px)"
<source width="378" height="348" type="image/webp" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/games-tablet.webp 1x, img/games-tablet@2x.webp 2x">
<!-- tablet -->
<source width="378" height="348" type="image/jpeg" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/games-tablet.jpg 1x, img/games-tablet@2x.jpg 2x">
<!-- mobile -->
<source width="290" height="290" type="image/webp" media="(max-width: 767px)"
srcset="img/games-mobile.jpg 1x, img/games-mobile@2x.jpg 2x">
<!-- desktop -->
<source width="660" height="500" type="image/webp" media="(min-width: 1366px)"
srcset="img/games-desktop.webp 1x, img/games-desktop@2x.webp 2x">
<img width="660" height="500" src="img/games-desktop.jpg" srcset="img/games-desktop@2x.jpg 2x"
alt="спортсмен за разлетающимся тальком">
</picture>
Expand Down Expand Up @@ -707,25 +695,24 @@ <h3>Год</h3>
</div>
<div class="offers__main-item-col offers__main-item-col--img">
<picture>
<!-- desktop -->
<source width="280" height="460" type="image/webp" media="(min-width: 1365px)"
srcset="img/action-desktop.webp 1x, img/action-desktop@2x.webp 2x">
<!-- tablet -->
<source width="400" height="462" type="image/webp" media="(min-width: 767px)"
srcset="img/action-tablet.webp 1x, img/action-tablet@2x.webp 2x">
<!-- mobile -->
<source width="320" height="360" type="image/webp" media="(max-width: 767px)"
srcset="img/action-mobile.webp 1x, img/action-mobile@2x.webp 2x">
<source width="320" height="360" type="image/jpeg" media="(max-width: 767px)"
srcset="img/action-mobile.jpg 1x, img/action-mobile@2x.jpg 2x">
<!-- tablet -->
<source width="400" height="462" type="image/webp" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/action-tablet.webp 1x, img/action-tablet@2x.webp 2x">
<!-- tablet -->
<source width="400" height="462" type="image/webp" media="(min-width: 767px)"
<source width="400" height="462" type="image/jpeg" media="(min-width: 768px) and (max-width: 1365px)"
srcset="img/action-tablet.jpg 1x, img/action-tablet@2x.jpg 2x">
<!-- mobile -->
<source width="320" height="360" type="image/webp" media="(max-width: 767px)"
srcset="img/action-mobile.jpg 1x, img/action-mobile@2x.jpg 2x">
<!-- desktop -->
<source width="280" height="460" type="image/webp" media="(min-width: 1366px)"
srcset="img/action-desktop.webp 1x, img/action-desktop@2x.webp 2x">
<img width="280" height="460" src="img/action-desktop.jpg" srcset="img/action-desktop@2x.jpg 2x"
alt="девушка в синей спортивной одежде на голубом фоне.">
</picture>

</div>
</div>
<div class="offers__item">
Expand Down
Loading