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.

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

New watches #1748

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
257 changes: 150 additions & 107 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "parcel-project-template",
"version": "2.0.0",
"description": "",
"homepage": "https://goitacademy.github.io/parcel-project-template",
"homepage": "https://DutuGabriel.github.io/Team-3-project",
"scripts": {
"start": "parcel src/*.html",
"build": "parcel build src/*.html --public-url /parcel-project-template/"
"build": "parcel build src/*.html --public-url /Team-3-project/"
},
"repository": {
"type": "git",
Expand Down
Binary file added src/images/rectangle8.jpg
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/images/rectangle9.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 11 additions & 4 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<!DOCTYPE html>
<html lang="ru">
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Page title</title>
<title>Team 3 Project</title>
<link rel="stylesheet" href="./sass/index.scss" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Epilogue:ital,wght@0,100..900;1,100..900&display=swap"
rel="stylesheet"
/>
<script type="module" src="./index.js"></script>
</head>
<body>
<h1>Example title</h1>
<!-- ❗️❗️❗️ Add partials like so for every page -->
<include src="./partials/example.html"></include>
<include src="./partials/header.html"></include>
<include src="./partials/hero.html"></include>
<include src="./partials/watches.html"></include>
</body>
</html>
1 change: 1 addition & 0 deletions src/partials/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file added src/partials/hero.html
Empty file.
10 changes: 10 additions & 0 deletions src/partials/watches.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<section class="new-watches">
<h6 class="mini-title">New Watches</h6>
<div class="paragraph">
<h2 class="section-title">Green And Bronze—The Match Made In Heaven</h2>
<div class="images">
<img class="watches-img" src="/src/images/Rectangle9.jpg" alt="GoIT" />
<img class="watches-img" src="/src/images/Rectangle8.jpg" alt="GoIt" />
</div>
</div>
</section>
Empty file added src/sass/header.scss
Empty file.
1 change: 1 addition & 0 deletions src/sass/hero.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

46 changes: 46 additions & 0 deletions src/sass/index.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,48 @@
/*Project style reset */

h1,
h2,
h3,
h4,
h5,
h6,
p {
margin: 0;
}

ul {
padding: 0;
margin: 0;
list-style-type: none;
}

*,
*::after,
*::before {
box-sizing: inherit;
}

body {
font-family: 'Epilogue', sans-serif;
background-color: var(--white);
}

img {
display: block;
width: 100%;
height: auto;
}

:root {
--white: #ffffff;
--darkgreen: #1e2827;
--black: #141414;
}

/* End style reset */

@import './common';
@import './example';
@import './header.scss';
@import './hero.scss';
@import './watches.scss';
71 changes: 71 additions & 0 deletions src/sass/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*Project style reset */

h1,
h2,
h3,
h4,
h5,
h6,
p {
margin: 0;
}

ul {
padding: 0;
margin: 0;
list-style-type: none;
}

a {
text-decoration: none;
font-style: normal;
}

body {
font-family: 'Epilogue', sans-serif;
background-color: var(--white);
}

img {
display: block;
width: 100%;
height: auto;
}

:root {
--white: #ffffff;
--darkgreen: #1e2827;
--black: #141414;
}

.section {
min-width: 375px;
width: 100%;
}

.container {
max-width: 335px;
margin: 0 auto;
}

@media screen and (min-width: 768px) {
.section {
min-width: 768px;
}

.container {
max-width: 704px;
}
}

@media screen and (min-width: 1280px) {
.section {
min-width: 1280px;
}

.container {
max-width: 1176px;
}
}

/* End style reset */
122 changes: 122 additions & 0 deletions src/sass/watches.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
@import url(styles.scss);

.new-watches{
width: 1440px;
height: 772px;
top: 3230px;
left: -1px;
padding: 80px 132px 80px 132px;
gap: 8px;
box-sizing: border-box;
}

.mini-title{
width: 85px;
height: 14px;
gap: 0px;
font-family:Epilogue sans-serif;
font-size: 12px;
font-weight: 300;
line-height: 14px;
letter-spacing: 0.06em;
text-align: left;
color: rgba(20, 20, 20, 0.4);
opacity: 40%;
display: inline-block;
}

.section-title{
width: 448px;
height: 88px;
opacity: 0px;
font-family: Epilogue sans-serif;
font-size: 40px;
font-weight: 600;
line-height: 44px;
letter-spacing: -0.02em;
text-align: left;
color: #1E2827;
display: flex;
margin-bottom: 50px;
}

.images{
width: 1176px;
height: 422px;
//gap: 24px;
opacity: 0px;
}
.paragraph{
width: 1176px;
height: 590px;
gap: 80px;
opacity: 0px;
flex-wrap: wrap;
}

.watches-img{
width: 576px;
max-height: 422px;
gap:24px;
display: inline;
justify-content: space-around;
align-items: center;
padding-right :20px;
}

@media (max-width: 600px) {
.section-title {
font-size: 32px;
font-weight: 600;
line-height: 40px;
letter-spacing: -0.02em;
text-align: left;
}

.watches-img {
width: 85%;
max-width: 85%;
margin-bottom: 10px;
}

.paragraph {
flex-direction: column;
}
}

@media screen and (min-width: 768px) {
.section-title {
font-size: 40px;
}

.new-watches {
padding: 60px 40px;
}

.paragraph {
justify-content: space-around;
}

.watches-img {
max-width: 48%;
}
}

@media screen and (min-width: 1280px) {
.section-title {
font-size: 40px;
}

.new-watches {
padding: 80px 132px;
}

.paragraph {
justify-content: center;
}

.watches-img {
max-width: 45%;
}
}