Skip to content
This repository was archived by the owner on Dec 7, 2023. It is now read-only.

Commit 7a0f514

Browse files
ckomop0xckomop0x
committed
Update project structure
1 parent 73b2c56 commit 7a0f514

File tree

9 files changed

+75
-47
lines changed

9 files changed

+75
-47
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"autoprefixer": "^10.2.6",
1919
"babel-loader": "^8.2.2",
2020
"clean-webpack-plugin": "^3.0.0",
21-
"copy-webpack-plugin": "^9.0.0",
21+
"copy-webpack-plugin": "^6.4.1",
2222
"css-loader": "^4.3.0",
2323
"eslint": "^7.28.0",
2424
"eslint-config-airbnb-base": "^14.2.1",

‎source/html/includes/common/header.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<header class="header">
22
<nav class="nav container">
3-
<a href="/" class="nav__logo">
4-
<img src="/img/logo.svg" alt="Логотип Create HTML boilerplate"/>
3+
<a href="/" class="nav__link">
4+
<span class="nav__title">
5+
<img src="/img/logo.svg"
6+
class="nav__logo"
7+
alt="Логотип Create HTML boilerplate" />
8+
Create HTML boilerplate v<%= version %></span>
59
</a>
610
</nav>
711
</header>

‎source/html/includes/index/hero.html‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
<section class="container">
2-
<h1 align="center">
3-
Create HTML boilerplate v<%= version %>
4-
</h1>
5-
<p>Привет! Спасибо за то что используете наш Create HTML boilerplate.</p>
1+
<section class="container hero">
2+
<h1>Привет! Спасибо за то что используете наш Create HTML boilerplate.</h1>
63
<p>
7-
Данная сборка вдохновлена проектом с хабра и многими часами вёрстки и
4+
Данная сборка вдохновлена проектом с Хабр и многими часами вёрстки и
85
разработки. Здесь специально нет ничего лишнего и только набор базовых
9-
файлов, чтобы было понятно как построить базовую структуру проекта
6+
файлов, чтобы было понятно как построить базовую структуру проекта.
107
</p>
11-
<ul>
12-
<li>HTML</li>
13-
<li>SCSS</li>
14-
<li>JS</li>
15-
<li>Шрифты</li>
16-
<li>Картинки и т.д.</li>
17-
</ul>
188
</section>

‎source/html/views/index.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
</head>
1616
<body>
1717
<!--header.html-->
18-
<%= _.template(require('../includes/common/header.html').default)({}) %>
18+
<%= _.template(require('../includes/common/header.html').default)({version: htmlWebpackPlugin.options.custom.version,}) %>
1919
<main>
2020
<!--index/hero.html-->
21-
<%= _.template(require('../includes/index/hero.html').default)({
22-
version: htmlWebpackPlugin.options.custom.version,
23-
}) %>
21+
<%= _.template(require('../includes/index/hero.html').default)({}) %>
2422
<!--index/structure.html-->
2523
<%= _.template(require('../includes/index/structure.html').default)({}) %>
2624
</main>

‎source/scss/blocks/hero.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.hero {
2+
h1 {
3+
margin-bottom: 20px;
4+
}
5+
6+
p {
7+
margin-bottom: 20px;
8+
}
9+
}

‎source/scss/blocks/nav.scss‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
.nav {
22
display: flex;
3-
justify-content: center;
4-
padding: 20px 0;
3+
justify-content: left;
54
}
65

7-
.nav__logo {
6+
.nav__link {
7+
display: flex;
8+
align-items: flex-start;
9+
padding: 10px 0;
10+
}
11+
12+
.nav__title {
13+
color: #cc5906;
814
display: flex;
915
align-items: center;
16+
font-size: 20px;
17+
font-weight: bold;
18+
}
1019

11-
img {
12-
width: 100px;
13-
}
20+
.nav__logo {
21+
width: 50px;
22+
margin-right: 20px;
1423
}

‎source/scss/global.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,19 @@ img {
2626
a {
2727
text-decoration: none;
2828
}
29+
30+
h1 {
31+
font-size: 24px;
32+
line-height: 1.25;
33+
}
34+
35+
pre {
36+
overflow-x: auto;
37+
font-size: 16px;
38+
width: 100%;
39+
padding: 20px;
40+
border: 1px solid rgb(204, 89, 6);
41+
background-color: #000;
42+
color: rgba(255, 255, 255, 0.7);
43+
border-radius: 15px 0 15px 0;
44+
}

‎source/scss/style.scss‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/* Это точка входа для всех стилей. Подключите сюда все файлы стилей, которые должны быть на странице.*/
1+
/*
2+
Это точка входа для всех стилей.
3+
Подключите сюда все файлы, которые
4+
должны быть на странице.
5+
*/
26

37
@import "font-face";
48
@import "variables";
@@ -9,3 +13,4 @@
913
@import "blocks/header";
1014
@import "blocks/nav";
1115
@import "blocks/logo";
16+
@import "blocks/hero";

‎yarn.lock‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,18 +1909,22 @@ copy-descriptor@^0.1.0:
19091909
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
19101910
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
19111911

1912-
copy-webpack-plugin@^9.0.0:
1913-
version "9.0.0"
1914-
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.0.tgz#2bf592785d2fcdde9342dfed3676490fe0aa7ce8"
1915-
integrity sha512-k8UB2jLIb1Jip2nZbCz83T/XfhfjX6mB1yLJNYKrpYi7FQimfOoFv/0//iT6HV1K8FwUB5yUbCcnpLebJXJTug==
1912+
copy-webpack-plugin@^6.4.1:
1913+
version "6.4.1"
1914+
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
1915+
integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
19161916
dependencies:
1917-
fast-glob "^3.2.5"
1918-
glob-parent "^6.0.0"
1919-
globby "^11.0.3"
1917+
cacache "^15.0.5"
1918+
fast-glob "^3.2.4"
1919+
find-cache-dir "^3.3.1"
1920+
glob-parent "^5.1.1"
1921+
globby "^11.0.1"
1922+
loader-utils "^2.0.0"
19201923
normalize-path "^3.0.0"
1921-
p-limit "^3.1.0"
1924+
p-limit "^3.0.2"
19221925
schema-utils "^3.0.0"
19231926
serialize-javascript "^5.0.1"
1927+
webpack-sources "^1.4.3"
19241928

19251929
core-js@^2.4.0:
19261930
version "2.6.12"
@@ -3216,7 +3220,7 @@ fast-glob@^2.0.2:
32163220
merge2 "^1.2.3"
32173221
micromatch "^3.1.10"
32183222

3219-
fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.5:
3223+
fast-glob@^3.0.3, fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5:
32203224
version "3.2.5"
32213225
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
32223226
integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
@@ -3687,20 +3691,13 @@ glob-parent@^3.1.0:
36873691
is-glob "^3.1.0"
36883692
path-dirname "^1.0.0"
36893693

3690-
glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
3694+
glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
36913695
version "5.1.2"
36923696
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
36933697
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
36943698
dependencies:
36953699
is-glob "^4.0.1"
36963700

3697-
glob-parent@^6.0.0:
3698-
version "6.0.0"
3699-
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.0.tgz#f851b59b388e788f3a44d63fab50382b2859c33c"
3700-
integrity sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==
3701-
dependencies:
3702-
is-glob "^4.0.1"
3703-
37043701
glob-to-regexp@^0.3.0:
37053702
version "0.3.0"
37063703
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -3780,7 +3777,7 @@ globby@^10.0.0:
37803777
merge2 "^1.2.3"
37813778
slash "^3.0.0"
37823779

3783-
globby@^11.0.3:
3780+
globby@^11.0.1, globby@^11.0.3:
37843781
version "11.0.4"
37853782
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
37863783
integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -6209,7 +6206,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
62096206
dependencies:
62106207
p-try "^2.0.0"
62116208

6212-
p-limit@^3.0.2, p-limit@^3.1.0:
6209+
p-limit@^3.0.2:
62136210
version "3.1.0"
62146211
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
62156212
integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==

0 commit comments

Comments
 (0)