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

Commit ac50b82

Browse files
ckomop0xckomop0x
authored
Merge pull request #10 from webtime-studio/v1.1.0
v1.1.0
2 parents 15cb402 + 039709c commit ac50b82

File tree

46 files changed

+118
-2439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+118
-2439
lines changed

‎source/fonts/Roboto-Regular.woff

91.6 KB
Binary file not shown.

‎source/fonts/Roboto-Regular.woff2

64.4 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.eot

-92.9 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.svg

Lines changed: 0 additions & 357 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.ttf

-257 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.woff

-120 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.woff2

-99.9 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.eot

-107 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.svg

Lines changed: 0 additions & 373 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.ttf

-284 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff

-136 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2

-113 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.eot

-91.3 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.svg

Lines changed: 0 additions & 363 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.ttf

-244 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.woff

-114 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.woff2

-94.5 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.eot

-103 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.svg

Lines changed: 0 additions & 376 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.ttf

-267 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff

-125 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2

-103 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.eot

-111 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.svg

Lines changed: 0 additions & 379 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.ttf

-299 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.woff

-142 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2

-117 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.eot

-104 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.svg

Lines changed: 0 additions & 363 deletions
This file was deleted.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.ttf

-273 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.woff

-130 KB
Binary file not shown.

‎source/fonts/ubuntu/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2

-109 KB
Binary file not shown.

‎source/html/views/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<meta name="format-detection" content="telephone=no" />
7+
<meta
8+
name="description"
9+
content="HTML5 webpack boilerplate"
10+
/>
611
<title>HTML5 webpack boilerplate</title>
712
<link rel="stylesheet" href="/vendors/normalize-css/normalize.min.css" />
813
</head>

‎source/img/logo.svg

Lines changed: 11 additions & 6 deletions

‎source/js/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
import '../scss/style.scss';
1+
// Это - ваша точка входа для скриптов страницы. Импортируйте сюда нужные вам файлы.
2+
3+
import "./script";

‎source/js/script.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Это пример файла со скриптами. Можете писать здесь код, который будет на странице.

‎source/scss/blocks/container.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
.container {
22
margin: 0 auto;
3-
min-width: $sm;
3+
width: $sm;
44
padding: 0 20px;
55

66
@media screen and (min-width: $md) {
7-
max-width: 768px;
7+
width: $md;
88
padding: 0 40px;
99
}
1010

1111
@media screen and (min-width: $xl) {
12-
max-width: 960px;
12+
width: $xl;
1313
padding: 0 50px;
1414
}
1515
}

‎source/scss/blocks/header.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,3 @@
22
background-color: $white;
33
margin: 0;
44
}
5-
6-
.nav {
7-
background-color: $gray;
8-
display: flex;
9-
justify-content: center;
10-
}
11-
12-
.nav__logo {
13-
align-items: center;
14-
display: flex;
15-
16-
img {
17-
width: 100px;
18-
}
19-
}

‎source/scss/blocks/logo.scss

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,3 @@
44
height: 83px;
55
width: 72px;
66
}
7-
8-
.logo__description {
9-
display: none;
10-
11-
@media screen and (min-width: $md) {
12-
display: flex;
13-
}
14-
}

‎source/scss/blocks/nav.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.nav {
2+
display: flex;
3+
justify-content: center;
4+
padding: 20px 0;
5+
6+
}
7+
8+
.nav__logo {
9+
display: flex;
10+
align-items: center;
11+
12+
img {
13+
width: 100px;
14+
}
15+
}

‎source/scss/blocks/visually-hidden.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* Этот блок используется для того, чтобы доступно прятать контент на странице. */
2+
3+
.visually-hidden {
4+
clip: rect(0 0 0 0);
5+
height: 1px;
6+
margin: -1px;
7+
position: absolute;
8+
width: 1px;
9+
}

‎source/scss/font-face.scss

Lines changed: 9 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,11 @@
1-
/* ubuntu-italic - latin-ext_latin_cyrillic-ext_cyrillic */
2-
@font-face {
3-
font-family: "Ubuntu";
4-
font-style: italic;
5-
font-weight: 400;
6-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.eot");
7-
/* IE9 Compat Modes */
8-
src: local("Ubuntu Italic"), local("Ubuntu-Italic"),
9-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.eot?#iefix")
10-
format("embedded-opentype"),
11-
/* IE6-IE8 */
12-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2")
13-
format("woff2"),
14-
/* Super Modern Browsers */
15-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.woff")
16-
format("woff"),
17-
/* Modern Browsers */
18-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.ttf")
19-
format("truetype"),
20-
/* Safari, Android, iOS */
21-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-italic.svg#Ubuntu")
22-
format("svg"); /* Legacy iOS */
23-
}
24-
/* ubuntu-regular - latin-ext_latin_cyrillic-ext_cyrillic */
25-
@font-face {
26-
font-family: "Ubuntu";
1+
/* Добавьте сюда все @font-face, которые будут использоваться в проекте */
2+
3+
@font-face {
4+
font-family: "Roboto";
5+
src:
6+
url("../fonts/Roboto-Regular.woff2") format("woff2"),
7+
url("../fonts/Roboto-Regular.woff") format("woff");
8+
font-weight: normal;
279
font-style: normal;
28-
font-weight: 400;
29-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.eot"); /* IE9 Compat Modes */
30-
src: local("Ubuntu Regular"), local("Ubuntu-Regular"),
31-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.eot?#iefix")
32-
format("embedded-opentype"),
33-
/* IE6-IE8 */
34-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2")
35-
format("woff2"),
36-
/* Super Modern Browsers */
37-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.woff")
38-
format("woff"),
39-
/* Modern Browsers */
40-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.ttf")
41-
format("truetype"),
42-
/* Safari, Android, iOS */
43-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-regular.svg#Ubuntu")
44-
format("svg"); /* Legacy iOS */
45-
}
46-
/* ubuntu-500 - latin-ext_latin_cyrillic-ext_cyrillic */
47-
@font-face {
48-
font-family: "Ubuntu";
49-
font-style: normal;
50-
font-weight: 500;
51-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.eot"); /* IE9 Compat Modes */
52-
src: local("Ubuntu Medium"), local("Ubuntu-Medium"),
53-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.eot?#iefix")
54-
format("embedded-opentype"),
55-
/* IE6-IE8 */
56-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.woff2")
57-
format("woff2"),
58-
/* Super Modern Browsers */
59-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.woff")
60-
format("woff"),
61-
/* Modern Browsers */
62-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.ttf")
63-
format("truetype"),
64-
/* Safari, Android, iOS */
65-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500.svg#Ubuntu")
66-
format("svg"); /* Legacy iOS */
67-
}
68-
/* ubuntu-500italic - latin-ext_latin_cyrillic-ext_cyrillic */
69-
@font-face {
70-
font-family: "Ubuntu";
71-
font-style: italic;
72-
font-weight: 500;
73-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.eot"); /* IE9 Compat Modes */
74-
src: local("Ubuntu Medium Italic"), local("Ubuntu-MediumItalic"),
75-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.eot?#iefix")
76-
format("embedded-opentype"),
77-
/* IE6-IE8 */
78-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2")
79-
format("woff2"),
80-
/* Super Modern Browsers */
81-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff")
82-
format("woff"),
83-
/* Modern Browsers */
84-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.ttf")
85-
format("truetype"),
86-
/* Safari, Android, iOS */
87-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-500italic.svg#Ubuntu")
88-
format("svg"); /* Legacy iOS */
89-
}
90-
/* ubuntu-700 - latin-ext_latin_cyrillic-ext_cyrillic */
91-
@font-face {
92-
font-family: "Ubuntu";
93-
font-style: normal;
94-
font-weight: 700;
95-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.eot"); /* IE9 Compat Modes */
96-
src: local("Ubuntu Bold"), local("Ubuntu-Bold"),
97-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.eot?#iefix")
98-
format("embedded-opentype"),
99-
/* IE6-IE8 */
100-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.woff2")
101-
format("woff2"),
102-
/* Super Modern Browsers */
103-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.woff")
104-
format("woff"),
105-
/* Modern Browsers */
106-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.ttf")
107-
format("truetype"),
108-
/* Safari, Android, iOS */
109-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700.svg#Ubuntu")
110-
format("svg"); /* Legacy iOS */
111-
}
112-
/* ubuntu-700italic - latin-ext_latin_cyrillic-ext_cyrillic */
113-
@font-face {
114-
font-family: "Ubuntu";
115-
font-style: italic;
116-
font-weight: 700;
117-
src: url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.eot"); /* IE9 Compat Modes */
118-
src: local("Ubuntu Bold Italic"), local("Ubuntu-BoldItalic"),
119-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.eot?#iefix")
120-
format("embedded-opentype"),
121-
/* IE6-IE8 */
122-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2")
123-
format("woff2"),
124-
/* Super Modern Browsers */
125-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff")
126-
format("woff"),
127-
/* Modern Browsers */
128-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.ttf")
129-
format("truetype"),
130-
/* Safari, Android, iOS */
131-
url("/fonts/ubuntu-v14-latin-ext_latin_cyrillic-ext_cyrillic-700italic.svg#Ubuntu")
132-
format("svg"); /* Legacy iOS */
10+
font-display: swap;
13311
}

‎source/scss/global.scss

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
html,
2-
body {
1+
html {
32
box-sizing: border-box;
43
}
54

@@ -9,22 +8,6 @@ body {
98
box-sizing: inherit;
109
}
1110

12-
img {
13-
max-width: 100%;
14-
}
15-
16-
a {
17-
text-decoration: none;
18-
}
19-
20-
.visually-hidden {
21-
clip: rect(0 0 0 0);
22-
height: 1px;
23-
margin: -1px;
24-
position: absolute;
25-
width: 1px;
26-
}
27-
2811
body {
2912
background-color: $white;
3013
color: $black;
@@ -35,3 +18,11 @@ body {
3518
margin: 0;
3619
padding: 0;
3720
}
21+
22+
img {
23+
max-width: 100%;
24+
}
25+
26+
a {
27+
text-decoration: none;
28+
}

‎source/scss/style.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
/* Это точка входа для всех стилей. Подключите сюда все файлы стилей, которые должны быть на странице.*/
2+
13
@import "font-face";
24
@import "variables";
35
@import "global";
6+
7+
@import "blocks/visually-hidden";
48
@import "blocks/container";
59
@import "blocks/header";
10+
@import "blocks/nav";
611
@import "blocks/logo";

‎source/scss/variables.scss

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
// sizes
1+
/* Здесь хранятся все переменные стилей проекта. Указанные ниже переменные приведены в качестве демонстрации. */
2+
3+
// Размеры вьюпорта
24
$sm: 320px;
35
$md: 768px;
46
$xl: 1280px;
57

6-
// colors
8+
// Цвета
79
$black: #000;
810
$white: #fff;
9-
$gray: #ccc;
11+
$grey: #ccc;
1012

11-
//fonts
12-
$main-font: "Ubuntu", "Arial", sans-serif;
13+
// Шрифты
14+
$main-font: "Roboto", "Arial", sans-serif;

0 commit comments

Comments
 (0)