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

Commit f9a487f

Browse files
tinakuzmenkotinakuzmenko
authored
Merge pull request #22 from webtime-studio/update/dependecies-update
2 parents 61a9b70 + bbc3750 commit f9a487f

File tree

9 files changed

+9637
-45
lines changed

9 files changed

+9637
-45
lines changed

‎package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
{
22
"name": "create-html-boilerplate",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"description": "create-html-boilerplate",
55
"scripts": {
6-
"stylelint": "stylelint \"source/scss/**/*.(scss|css)\"",
7-
"eslint": "eslint \"source/js/**/*.js\"",
6+
"start": "webpack-dev-server --config webpack/webpack.config.js --open",
87
"test": "concurrently npm:stylelint npm:eslint",
98
"build": "webpack --progress --config webpack/webpack.config.js -p",
10-
"prettier": "prettier --write \"source/(scss|js)/**/*.(scss|css|js|json)\"",
11-
"start": "webpack-dev-server --config webpack/webpack.config.js --open"
9+
"stylelint": "stylelint \"source/scss/**/*.(scss|css)\"",
10+
"eslint": "eslint \"source/js/**/*.js\"",
11+
"prettier": "prettier --write \"source/(scss|js)/**/*.(scss|css|js|json)\""
1212
},
1313
"dependencies": {
14-
"concurrently": "^6.0.0",
14+
"concurrently": "^6.2.0",
1515
"picturefill": "^3.0.3"
1616
},
1717
"devDependencies": {
18-
"autoprefixer": "^10.2.5",
18+
"autoprefixer": "^10.2.6",
1919
"babel-loader": "^8.2.2",
2020
"clean-webpack-plugin": "^3.0.0",
2121
"copy-webpack-plugin": "^6.4.1",
2222
"css-loader": "^4.3.0",
23-
"eslint": "^7.23.0",
23+
"eslint": "^7.28.0",
2424
"eslint-config-airbnb-base": "^14.2.1",
25-
"eslint-config-prettier": "^8.1.0",
26-
"eslint-plugin-import": "^2.22.1",
27-
"eslint-plugin-prettier": "^3.3.1",
25+
"eslint-config-prettier": "^8.3.0",
26+
"eslint-plugin-import": "^2.23.4",
27+
"eslint-plugin-prettier": "^3.4.0",
2828
"html-webpack-plugin": "^4.5.2",
29-
"imagemin-webp-webpack-plugin": "^3.3.3",
29+
"imagemin-webp-webpack-plugin": "^3.3.4",
3030
"imagemin-webpack-plugin": "^2.4.2",
31-
"mini-css-extract-plugin": "^1.4.0",
31+
"mini-css-extract-plugin": "^1.6.0",
3232
"node-sass": "^4.14.1",
3333
"optimize-css-assets-webpack-plugin": "^5.0.4",
34-
"postcss": "^8.2.9",
34+
"postcss": "^8.3.5",
3535
"postcss-loader": "^4.2.0",
3636
"preload-webpack-plugin": "^3.0.0-beta.4",
37-
"prettier": "^2.2.1",
37+
"prettier": "^2.3.1",
3838
"raw-loader": "^4.0.2",
3939
"sass-loader": "^10.1.1",
40-
"stylelint": "^13.12.0",
40+
"stylelint": "^13.13.1",
4141
"stylelint-config-prettier": "^8.0.2",
4242
"stylelint-config-recommended-scss": "^4.2.0",
43-
"stylelint-config-standard": "^21.0.0",
43+
"stylelint-config-standard": "^22.0.0",
4444
"stylelint-prettier": "^1.2.0",
4545
"stylelint-scss": "^3.19.0",
46-
"svg-sprite-loader": "^6.0.2",
46+
"svg-sprite-loader": "^6.0.7",
4747
"svgo": "^2.3.0",
4848
"svgo-loader": "^3.0.0",
4949
"terser-webpack-plugin": "^4.2.3",

‎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: #252525;
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";

0 commit comments

Comments
 (0)