Skip to content

Commit dcc9617

Browse files
SpirikSpirik
committed
Home Join block
1 parent 45435f3 commit dcc9617

13 files changed

+347
-4
lines changed

‎_data/page_index.json

+21
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,27 @@
7878
"text": "Разработчик АО «Лаборатория Касперского»."
7979
}
8080
]
81+
},
82+
"join": {
83+
"heading": "__Условия вступления__",
84+
"text": {
85+
"col1": "Группа выполняет роль эксперта в области стандартизации языка C++ и является «голосом» русcкоговорящих разработчиков в вопросах совершенствования стандарта. Члены группы являются экспертами и консультантами в этих вопросах и помогают готовить и продвигать идеи и предложения.\n\nЧленство в группе, в первую очередь, предполагает ответственность, серьёзную работу и большую нагрузку, и уже после — возможность прославиться.",
86+
"col2": "Вступление в РГ 21 С++ не гарантирует вступление в Global Directory, так как количество мест от страны в GD ограничено. Также вступление в GD не входит в зону ответственности рабочей группы, а решается на уровне выше."
87+
},
88+
"insertText": "Чтобы вступить в РГ 21 С++, необходимо [оставить заявку](https://github.com/cpp-ru/cpp-ru.github.io/issues/new) с описанием цели участия, своих идей развития стандарта.\n\nДополнительно — предоставить подтверждение своего опыта и компетенций в области С++ в виде: статей о С++ и инженерии, научных работ, авторства предложений в стандарт, ссылок на видео докладов с мероприятий профессионального сообщества.",
89+
"insertBlock": {
90+
"title": "Участникам предстоит:",
91+
"list": [
92+
"обрабатывать входящие идеи для предложений в стандарт;",
93+
"участвовать в обсуждениях списка предложений;",
94+
"писать и дорабатывать предложения в стандарт от России и консультировать разработчиков, готовых писать предложения самостоятельно;",
95+
"выступать с докладами на открытых встречах РГ 21 С++ и сообщества."
96+
]
97+
},
98+
"cta": {
99+
"url": "https://github.com/cpp-ru/cpp-ru.github.io/issues/new",
100+
"text": "Оставить заявку на GitHub"
101+
}
81102
}
82103
}
83104
}

‎_includes/home-join.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{% assign fields = site.data.page_index.fields.join %}
2+
<div class="home-join">
3+
<div class="home-join__inset">
4+
<div class="home-join__container container">
5+
<h1 class="home-join__heading heading-h2">
6+
{{ fields.heading | markdownify | remove: '<p>' | remove: '</p>' }}
7+
</h1>
8+
<div class="home-join__cols">
9+
<div class="home-join__col home-join__col_l">
10+
<div class="home-join__text home-join__text_mobile-hide">
11+
{{ fields.text.col1 | markdownify }}
12+
</div>
13+
<div class="home-join__text-bold home-join__text-bold_mobile-show">
14+
{{ fields.text.col2 | markdownify }}
15+
</div>
16+
17+
<div class="home-join__insert-text insert-text">
18+
<div class="insert-text__text">
19+
{{ fields.insertText | markdownify }}
20+
</div>
21+
</div>
22+
23+
</div>
24+
<div class="home-join__col home-join__col_r">
25+
<div class="home-join__text home-join__text_mobile-show">
26+
{{ fields.text.col1 | markdownify }}
27+
</div>
28+
<div class="home-join__text-bold home-join__text-bold_mobile-hide">
29+
{{ fields.text.col2 | markdownify }}
30+
</div>
31+
32+
<div class="home-join__insert-block insert-block">
33+
<div class="insert-block__icon-wrap">
34+
<svg viewBox="0 0 34 34" class="insert-block__icon insert-block__icon_arrow-angle">
35+
<use xlink:href="#icon-arrow-angle"></use>
36+
</svg>
37+
</div>
38+
<div class="insert-block__inset">
39+
<h3 class="insert-block__title">
40+
{{ fields.insertBlock.title | markdownify | remove: '<p>' | remove: '</p>' }}
41+
</h3>
42+
<ul class="insert-block__list">
43+
{% for item in fields.insertBlock.list %}
44+
<li class="insert-block__list-item">
45+
{{ item | markdownify | remove: '<p>' | remove: '</p>' }}
46+
</li>
47+
{% endfor %}
48+
</ul>
49+
</div>
50+
</div>
51+
52+
</div>
53+
</div>
54+
<div class="home-join__cta">
55+
<a
56+
href="{{ fields.cta.url }}"
57+
class="home-hero__cta-button button"
58+
target="_blank"
59+
rel="noopener noreferrer"
60+
>
61+
{{ fields.cta.text }}
62+
</a>
63+
</div>
64+
</div>
65+
</div>
66+
</div>

‎_includes/svg-defs.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<defs>
44
<g id="icon-logo">
55
<g clip-path="url(#logo-a)" fill="currentColor"><path d="M0 23.124A23.128 23.128 0 0 1 39.48 6.77l-6.036 6.032a14.591 14.591 0 1 0 0 20.637l6.036 6.029A23.128 23.128 0 0 1 0 23.124z"/><path d="M51.87 12.093h-7.315v7.373h-7.373v7.316h7.373v7.373h7.315v-7.373h7.373v-7.316H51.87v-7.373zm34.836 7.373H79.33V12.09h-7.315v7.377h-7.373v7.316h7.373v7.373h7.316v-7.373h7.376v-7.316zm-84.84 35.63v2.712h1.088c.236.003.471-.024.7-.08.196-.047.381-.134.544-.254.157-.117.282-.273.362-.453.09-.213.133-.443.127-.674a1.087 1.087 0 0 0-.428-.953 2.131 2.131 0 0 0-1.236-.298H1.867zm0 3.575v2.83H.904v-7.25h2.12a3.158 3.158 0 0 1 1.925.483 1.852 1.852 0 0 1 .685 1.588c.01.364-.059.726-.2 1.062a1.914 1.914 0 0 1-.554.725c-.251.197-.542.339-.852.417-.355.09-.72.134-1.087.13l-1.073.015zM8.04 55.1v6.405h-.964v-7.268h4.038v.863H8.04zm4.162 6.405v-.942c.623-.483 1.16-.925 1.61-1.323.393-.34.766-.703 1.116-1.088a4.02 4.02 0 0 0 .66-.92c.14-.286.213-.6.213-.918a1.302 1.302 0 0 0-.391-.99 1.617 1.617 0 0 0-1.153-.362 2.54 2.54 0 0 0-.953.181 3.026 3.026 0 0 0-.812.479l-.113-.953c.256-.182.544-.315.849-.392a4.262 4.262 0 0 1 1.12-.138c.351-.006.701.045 1.036.153.269.095.515.243.726.435.201.182.359.407.46.66.107.27.16.56.156.851.001.398-.084.791-.25 1.153a4.443 4.443 0 0 1-.725 1.066 9.19 9.19 0 0 1-1.117 1.062c-.44.358-.934.737-1.482 1.138h3.624v.863l-4.574-.015zm8.076 0v-6.119L18.27 56.92v-1.026l2.175-1.657h.783v7.268h-.95zm8.943.116a3.85 3.85 0 0 1-1.41-.253 3.207 3.207 0 0 1-1.127-.725 3.379 3.379 0 0 1-.747-1.197 4.314 4.314 0 0 1-.268-1.57 4.63 4.63 0 0 1 .25-1.572c.155-.438.402-.837.725-1.171a3.049 3.049 0 0 1 1.116-.725c.464-.174.955-.26 1.45-.254.42-.002.838.058 1.24.177.302.086.593.207.866.363l-.141.906a3.139 3.139 0 0 0-.892-.442 3.55 3.55 0 0 0-1.087-.16 2.357 2.357 0 0 0-1.83.726c-.438.483-.657 1.202-.657 2.156-.056.79.197 1.57.707 2.175a2.538 2.538 0 0 0 1.892.725 2.71 2.71 0 0 0 .935-.152 4.14 4.14 0 0 0 .805-.457l.265.801c-.252.186-.53.33-.827.428a3.724 3.724 0 0 1-1.265.192v.03zm5.942-3.179v2.132h-.83v-2.132h-2.03v-.725h2.03V55.6h.83v2.132h2.03v.725l-2.03-.015zm5.709 0v2.132h-.83v-2.132h-2.03v-.725h2.03V55.6h.83v2.132h2.034v.725l-2.034-.015zm6.427-3.346v2.712h1.087c.236.003.471-.024.7-.08.197-.047.381-.134.544-.254.157-.117.282-.273.362-.453.09-.213.133-.443.127-.674a1.087 1.087 0 0 0-.428-.953 2.131 2.131 0 0 0-1.218-.294l-1.174-.004zm0 3.575v2.83h-.964v-7.25h2.12a3.157 3.157 0 0 1 1.933.483 1.854 1.854 0 0 1 .685 1.588 2.58 2.58 0 0 1-.2 1.062 1.914 1.914 0 0 1-.554.725c-.252.197-.542.339-.852.417-.356.09-.721.134-1.088.13l-1.08.015zm8.261 2.073c.332.004.662-.048.975-.156.294-.102.56-.272.776-.496.237-.254.414-.558.519-.889.25-.869.25-1.791 0-2.66a2.342 2.342 0 0 0-.519-.888 1.983 1.983 0 0 0-.776-.497 3.074 3.074 0 0 0-1.942 0 1.976 1.976 0 0 0-.784.497c-.238.254-.416.559-.521.891-.251.87-.251 1.792 0 2.661.104.331.281.634.518.888.218.226.486.396.783.497.311.106.639.159.968.156l.003-.004zm-.003.867a3.748 3.748 0 0 1-1.37-.25 3.094 3.094 0 0 1-1.106-.726 3.406 3.406 0 0 1-.725-1.178 4.96 4.96 0 0 1 0-3.222c.157-.433.404-.827.725-1.157.314-.31.691-.548 1.105-.7a3.886 3.886 0 0 1 1.37-.239c.475-.004.947.077 1.393.24.41.153.78.395 1.087.707.322.332.569.728.725 1.163a5.02 5.02 0 0 1 0 3.212c-.158.438-.404.84-.725 1.178a3.048 3.048 0 0 1-1.087.725c-.445.17-.917.254-1.392.25v-.003zm8.073.01a3.85 3.85 0 0 1-1.41-.253 3.211 3.211 0 0 1-1.128-.725 3.386 3.386 0 0 1-.747-1.178 4.323 4.323 0 0 1-.268-1.57 4.617 4.617 0 0 1 .25-1.573c.156-.438.403-.837.725-1.171a3.05 3.05 0 0 1 1.117-.725c.463-.174.955-.26 1.45-.254.42-.007.839.048 1.243.163.303.085.593.207.867.363l-.153.935a3.142 3.142 0 0 0-.891-.442 3.557 3.557 0 0 0-1.088-.16 2.359 2.359 0 0 0-1.83.725c-.436.483-.654 1.202-.657 2.157-.002.955.233 1.68.707 2.175a2.54 2.54 0 0 0 1.892.725c.319.005.635-.047.936-.152.284-.105.557-.242.812-.406l.264.8c-.251.186-.53.33-.826.429a3.716 3.716 0 0 1-1.265.192v-.055zm6.72 0a3.85 3.85 0 0 1-1.41-.253 3.212 3.212 0 0 1-1.127-.725 3.385 3.385 0 0 1-.75-1.197 4.321 4.321 0 0 1-.269-1.57 4.62 4.62 0 0 1 .25-1.572c.156-.438.403-.837.725-1.171a3.049 3.049 0 0 1 1.117-.725c.463-.174.955-.26 1.45-.254.42-.007.839.048 1.243.163.303.085.594.207.867.362l-.153.936a3.143 3.143 0 0 0-.891-.443 3.557 3.557 0 0 0-1.088-.159 2.36 2.36 0 0 0-1.83.725c-.435.483-.654 1.202-.657 2.157-.002.954.234 1.68.707 2.175a2.54 2.54 0 0 0 1.892.725c.319.004.635-.047.936-.152.285-.105.557-.242.812-.406l.264.8c-.25.186-.53.33-.826.428a3.721 3.721 0 0 1-1.265.193l.003-.037zm3.6-7.384h.964v5.992l3.988-5.992h1.037v7.268h-.976V55.54l-3.987 5.966H73.95v-7.268zm11.625 3.495v-2.636H84.38a3.1 3.1 0 0 0-.663.066 1.451 1.451 0 0 0-.519.217 1.04 1.04 0 0 0-.34.403c-.088.192-.13.401-.124.612a1.223 1.223 0 0 0 .395 1.012c.335.233.739.346 1.146.319l1.301.007zm0 .862h-1.218l-2.008 2.9H81.2l2.204-3.084a2.175 2.175 0 0 1-1.229-.664 2 2 0 0 1-.424-1.355 2.272 2.272 0 0 1 .174-.972 1.78 1.78 0 0 1 .544-.67c.25-.184.535-.314.837-.385a4.425 4.425 0 0 1 1.088-.123h2.175v7.25h-.965l-.029-2.897z"/></g><defs><clipPath id="logo-a"><path fill="#fff" d="M0 0h87v61.625H0z"/></clipPath></defs>
6-
<g>
6+
</g>
7+
<g id="icon-arrow-angle">
8+
<path stroke="currentColor" stroke-width="2" d="M23.265 6.387l-12.263 21.24M7.096 9.592l3.746 18.124 17.568-5.818"/>
9+
</g>
710
</defs>
811
</svg>
912
</div>

‎_sass/blocks/_home-join.scss

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
.home-join__inset {
2+
margin: 0 auto;
3+
padding: 50px 0 100px;
4+
background: #fff;
5+
border-radius: 50px 50px 0 0;
6+
7+
@include breakpoint-lo($small-viewport) {
8+
padding: 40px 0 60px;
9+
border-radius: 20px;
10+
}
11+
}
12+
13+
.home-join__heading {
14+
@include breakpoint-lo($small-viewport) {
15+
max-width: 220px;
16+
}
17+
}
18+
19+
/* Text */
20+
21+
.home-join__cols {
22+
display: flex;
23+
flex-flow: row wrap;
24+
align-items: stretch;
25+
justify-content: space-between;
26+
margin: -15px 0 0;
27+
}
28+
29+
.home-join__col {
30+
display: flex;
31+
flex-flow: column nowrap;
32+
align-items: stretch;
33+
justify-content: space-between;
34+
width: 50%;
35+
36+
&_l {
37+
padding-right: 10px;
38+
39+
@include breakpoint-lo($small-viewport) {
40+
padding-right: 0;
41+
}
42+
}
43+
44+
&_r {
45+
padding-left: 30px;
46+
47+
@include breakpoint-lo($small-viewport) {
48+
order: -1;
49+
padding-left: 0;
50+
}
51+
52+
/* @include breakpoint-lo($smaller-viewport) {
53+
display: none;
54+
} */
55+
}
56+
57+
@include breakpoint-lo($small-viewport) {
58+
width: 100%;
59+
}
60+
}
61+
62+
/* Text */
63+
64+
.home-join__text,
65+
.home-join__text-bold {
66+
&_mobile-hide {
67+
@include breakpoint-lo($small-viewport) {
68+
display: none;
69+
}
70+
}
71+
72+
&_mobile-show {
73+
display: none;
74+
75+
@include breakpoint-lo($small-viewport) {
76+
display: block;
77+
}
78+
}
79+
}
80+
81+
.home-join__text-bold {
82+
font-weight: 500;
83+
84+
@include breakpoint-lo($small-viewport) {
85+
margin: 15px 0 25px;
86+
font-size: 14px;
87+
}
88+
}
89+
90+
/* Blocks */
91+
92+
.home-join__insert-block {
93+
@include breakpoint-lo($small-viewport) {
94+
margin-top: 15px;
95+
}
96+
}
97+
98+
99+
/* CTA */
100+
101+
.home-join__cta {
102+
margin: 50px 0 0;
103+
104+
@include breakpoint-lo($small-viewport) {
105+
margin: 40px 0 0;
106+
}
107+
}

‎_sass/blocks/_home-results.scss

+8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@
3232
.home-results__col {
3333
width: 50%;
3434

35+
&_l {
36+
padding-right: 10px;
37+
38+
@include breakpoint-lo($small-viewport) {
39+
padding-right: 0;
40+
}
41+
}
42+
3543
&_r {
3644
padding-left: 30px;
3745
font-weight: 500;

‎_sass/blocks/_home-team.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.home-team {
2-
padding: 0 0 110px;
2+
margin: 0 0 110px;
33

44
@include breakpoint-lo($small-viewport) {
5-
padding: 0 0 53px;
5+
margin: 0 0 53px;
66
}
77
}
88

‎_sass/common/_variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $color-text-light: #fff;
99
$color-text-accent: $color-brand-blue;
1010
$color-bg-body: #e5e5e5;
1111
$color-gray: #ccc;
12-
$color-gray-light: #e4e4e4;
12+
$color-gray-light: #efefef;
1313
$color-link: $color-brand-blue;
1414
$color-link-hover: #4da8ff;
1515

‎_sass/ui/_heading-h2.scss

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
font: 300 62px/1.16 $font-family-heading;
55
letter-spacing: 0.03em;
66

7+
strong {
8+
color: $color-text-accent;
9+
font-weight: 300;
10+
}
11+
712
@include breakpoint-lo($small-viewport) {
813
margin: 0 0 20px;
914
font-size: 32px;

‎_sass/ui/_insert-block.scss

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
.insert-block {
2+
position: relative;
3+
margin: 40px 0 0;
4+
padding: 32px 30px;
5+
border: solid 2px $color-text;
6+
border-radius: 10px 100px 10px 10px;
7+
8+
@include breakpoint-lo($small-viewport) {
9+
margin: 33px 0 0;
10+
padding: 27px 11px;
11+
border-radius: 10px 60px 10px 10px;
12+
}
13+
}
14+
15+
.insert-block__icon-wrap {
16+
position: absolute;
17+
top: -24px;
18+
right: 60px;
19+
display: flex;
20+
align-items: center;
21+
justify-content: center;
22+
width: 48px;
23+
height: 48px;
24+
background: $color-text;
25+
border-radius: 48px;
26+
color: #fff;
27+
28+
@include breakpoint-lo($small-viewport) {
29+
top: -14px;
30+
right: 42px;
31+
width: 28px;
32+
height: 28px;
33+
}
34+
}
35+
36+
.insert-block__icon {
37+
&_arrow-angle {
38+
width: 34px;
39+
height: 34px;
40+
41+
@include breakpoint-lo($small-viewport) {
42+
width: 20px;
43+
height: 20px;
44+
}
45+
}
46+
}
47+
48+
.insert-block__title {
49+
margin: 0 0 28px;
50+
padding: 0;
51+
font: 400 24px/1.3 $font-family-heading;
52+
53+
@include breakpoint-lo($small-viewport) {
54+
margin: 0 0 20px;
55+
}
56+
}
57+
58+
.insert-block__list {
59+
margin: 0;
60+
padding: 0;
61+
list-style: none;
62+
}
63+
64+
.insert-block__list-item {
65+
position: relative;
66+
margin: 0 0 20px;
67+
padding: 0 0 0 30px;
68+
font-size: 18px;
69+
70+
&:last-child {
71+
margin: 0;
72+
}
73+
74+
&:before {
75+
content: '';
76+
position: absolute;
77+
top: 4px;
78+
left: 0;
79+
width: 18px;
80+
height: 18px;
81+
background: url('#{$baseurl}/assets/images/i-bullet-plus.svg') transparent 0 0 no-repeat;
82+
}
83+
84+
@include breakpoint-lo($small-viewport) {
85+
font-size: 16px;
86+
}
87+
}

‎_sass/ui/_insert-text.scss

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
.insert-text {
2+
padding: 36px 75px 36px 32px;
3+
background: $color-gray-light;
4+
border-radius: 10px 113px 113px 10px;
5+
6+
@include breakpoint-lo($small-viewport) {
7+
margin-left: -1 * $padding-side-sm;
8+
padding: 35px 38px 35px 32px;
9+
border-radius: 10px 60px 60px 10px;
10+
}
11+
12+
&_round-left {
13+
padding: 36px 32px 36px 75px;
14+
border-radius: 113px 10px 10px 113px;
15+
16+
@include breakpoint-lo($small-viewport) {
17+
padding: 35px 32px 35px 38px;
18+
border-radius: 60px 10px 10px 60px;
19+
}
20+
}
21+
}
22+
23+
.insert-text__text {
24+
font-size: 16px;
25+
26+
a {
27+
font-weight: 700;
28+
}
29+
30+
p:first-child {
31+
margin-top: 0;
32+
}
33+
34+
p:last-child {
35+
margin-bottom: 0;
36+
}
37+
38+
@include breakpoint-lo($small-viewport) {
39+
font-size: 14px;
40+
}
41+
}

0 commit comments

Comments
 (0)