Skip to content

Commit 907ed5b

Browse files
ShureckShureck
authored
Merge pull request #216 from RTUITLab/sync/master
fix style and add new tags
2 parents 56ce893 + 5d13a85 commit 907ed5b

4 files changed

Lines changed: 123 additions & 118 deletions

File tree

‎src/js/gallery/gallery.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
max-height: 370px;
3737
height: 40vw;
3838
position: absolute;
39-
outline: none;
39+
border-radius: 15px;
4040

41-
overflow: hidden;
4241
display: block;
4342

4443
img {
4544
border-radius: 15px;
45+
outline: 0.5px solid rgba(159,159,159,0.25);
4646
}
4747

4848
@media (max-height: 850px) {
@@ -57,7 +57,7 @@
5757
max-width: 700px;
5858
max-height: 370px;
5959

60-
outline: none;
60+
border-radius: 15px;
6161

6262
@media (max-height: 850px) {
6363
max-height: 300px;

‎src/layout/achievementPageTemplate/achievementPageTemplate.pug‎

Lines changed: 114 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,120 @@
11
block variables
22

33
-
4-
var time =new Date(Date.parse(achievementData.date))
4+
var time = new Date(Date.parse(achievementData.date))
55
66
doctype html
77
html(lang="ru")
8-
head
9-
meta(charset="UTF-8")
10-
meta(http-equiv="X-UA-Compatible" content="IE=edge")
11-
meta(name="viewport" content="width=device-width, initial-scale=1.0")
12-
title RTUITLab — #{achievementData.title}
13-
14-
script(async="async").
15-
let scripts = [
16-
process.env.MARKDOWN_IT, process.env.SWIPER_LINK
17-
]
18-
for (let i of scripts) {
19-
var js = document.createElement('script');
20-
js.src = i;
21-
js.async = "async"
22-
var head = document.getElementsByTagName('head')[0];
23-
head.appendChild(js);
24-
}
25-
26-
meta(name="description" content=achievementData.shortdescription.replaceAll("\\n", ""))
27-
link(rel="stylesheet" href="../layout/swiper/swiper-bundle.min.css")
28-
link(rel="canonical" href="https://rtuitlab.dev")
29-
link(rel="stylesheet" href="../layout/achievementPageTemplate/achievementPageTemplate.scss")
30-
script(src="../js/achievementPageTemplate/achievementPageTemplate.js",defer)
31-
link(rel="stylesheet" href="../indexStyles.scss")
32-
33-
34-
35-
script(defer="defer").
36-
window.onload = function() {
37-
38-
function decodeHtml(html) {
39-
var txt = document.createElement("textarea");
40-
txt.innerHTML = html;
41-
return txt.value;
42-
}
43-
44-
var md = window.markdownit({
45-
html: true,
46-
xhtmlOut: true,
47-
breaks: true,
48-
linkify: true,
49-
typographer: true,
50-
quotes: '«»'})
51-
document.getElementById("longdescription").innerHTML=md.render(decodeHtml("#{achievementData.longdescription}"))
52-
}
53-
54-
55-
script(type='application/ld+json').
56-
{
57-
"@context": "https://schema.org",
58-
"@type": "BlogPosting",
59-
"mainEntityOfPage": {
60-
"@type": "WebPage",
61-
"@id": "https://rtuitlab.dev"
62-
},
63-
"headline": "#{achievementData.title}",
64-
"image": "#{achievementData.images[0]}",
65-
"author": {
66-
"@type": "Organization",
67-
"name": "RTUITLab",
68-
"url": "https://rtuitlab.dev"
69-
},
70-
"publisher": {
71-
"@type": "Organization",
72-
"name": "RTUITLab",
73-
"logo": {
74-
"@type": "ImageObject",
75-
"url": ""
76-
}
77-
},
78-
"datePublished": ""
79-
}
80-
81-
body.achievementsPageTemplate
82-
header
83-
section.buttonContainer
84-
button(onclick="if(window.history.length>2)window.history.back();else{window.location=\"/\"}")
85-
img(src="../images/icons/buttonArrow.svg" alt="")
86-
| Назад
87-
88-
.titleContainer
89-
h1 #{achievementData.title}
90-
91-
section.desc #{achievementData.shortdescription}
92-
93-
main
94-
section.content
95-
.galleryParent
96-
.swiper.achievementsSwiperParent
97-
.swiper-wrapper
98-
each object in achievementData.images
99-
.swiper-slide
100-
img(src="../"+object, alt="" loading='lazy')
101-
each object in achievementData.videos
102-
.swiper-slide
103-
video(src=object, alt="" loop autoplay muted)
104-
.swiper-pagination.achievementsSwiperPagination
105-
106-
article.info
107-
h3 О событии
108-
section#longdescription
109-
p
110-
strong
111-
|Дата проведения: #{(time).toLocaleDateString("ru")}
112-
113-
if achievementData.members.length>0
114-
section.members
115-
h2 Участники
116-
section.itemsParent
117-
each obj in achievementData.members
118-
.item
119-
p #{obj}
8+
head
9+
meta(charset="UTF-8")
10+
meta(http-equiv="X-UA-Compatible" content="IE=edge")
11+
meta(name="viewport" content="width=device-width, initial-scale=1.0")
12+
title RTUITLab — #{achievementData.title}
13+
14+
script(async="async").
15+
let scripts = [
16+
process.env.MARKDOWN_IT, process.env.SWIPER_LINK
17+
]
18+
for (let i of scripts) {
19+
var js = document.createElement('script');
20+
js.src = i;
21+
js.async = "async"
22+
var head = document.getElementsByTagName('head')[0];
23+
head.appendChild(js);
24+
}
25+
26+
meta(name="description" content=achievementData.shortdescription.replaceAll("\\n", ""))
27+
link(rel="stylesheet" href="../layout/swiper/swiper-bundle.min.css")
28+
link(rel="canonical" href="https://rtuitlab.dev")
29+
link(rel="stylesheet" href="../layout/achievementPageTemplate/achievementPageTemplate.scss")
30+
script(src="../js/achievementPageTemplate/achievementPageTemplate.js",defer)
31+
link(rel="stylesheet" href="../indexStyles.scss")
32+
33+
34+
35+
script(defer="defer").
36+
window.onload = function() {
37+
38+
function decodeHtml(html) {
39+
var txt = document.createElement("textarea");
40+
txt.innerHTML = html;
41+
return txt.value;
42+
}
43+
44+
var md = window.markdownit({
45+
html: true,
46+
xhtmlOut: true,
47+
breaks: true,
48+
linkify: true,
49+
typographer: true,
50+
quotes: '«»'
51+
})
52+
document.getElementById("longdescription").innerHTML = md.render(decodeHtml("#{achievementData.longdescription}"))
53+
}
54+
55+
56+
script(type='application/ld+json').
57+
{
58+
"@context": "https://schema.org",
59+
"@type": "BlogPosting",
60+
"mainEntityOfPage": {
61+
"@type": "WebPage",
62+
"@id": "https://rtuitlab.dev"
63+
},
64+
"headline": "#{achievementData.title}",
65+
"image": "#{achievementData.images[0]}",
66+
"author": {
67+
"@type": "Organization",
68+
"name": "RTUITLab",
69+
"url": "https://rtuitlab.dev"
70+
},
71+
"publisher": {
72+
"@type": "Organization",
73+
"name": "RTUITLab",
74+
"logo": {
75+
"@type": "ImageObject",
76+
"url": ""
77+
}
78+
},
79+
"datePublished": ""
80+
}
81+
82+
body.achievementsPageTemplate
83+
header
84+
section.buttonContainer
85+
button(onclick="if(window.history.length>2)window.history.back();else{window.location=\"/\"}")
86+
img(src="../images/icons/buttonArrow.svg" alt="")
87+
| Назад
88+
89+
.titleContainer
90+
h1 #{achievementData.title}
91+
92+
section.desc #{achievementData.shortdescription}
93+
94+
main
95+
section.content
96+
.galleryParent
97+
.swiper.achievementsSwiperParent
98+
.swiper-wrapper
99+
each object in achievementData.images
100+
.swiper-slide
101+
img(src="../" + object, alt="" loading='lazy')
102+
each object in achievementData.videos
103+
.swiper-slide
104+
video(src=object, alt="" loop autoplay muted)
105+
.swiper-pagination.achievementsSwiperPagination
106+
107+
article.info
108+
h3 О событии
109+
section#longdescription
110+
p
111+
strong
112+
| Дата новости: #{(time).toLocaleDateString("ru")}
113+
114+
if achievementData.members.length > 0
115+
section.members
116+
h2 Участники
117+
section.itemsParent
118+
each obj in achievementData.members
119+
.item
120+
p #{obj}

‎src/layout/projects/projects.pug‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../../js/data/projectsData.pug
22

33
-
4-
let tags = ["Все","Backend", "Frontend", "VR", "AR", "ML"]
4+
let tags = ["Все", "Backend", "Frontend", "Mobile", "GameDev", "VR", "AR", "ML", "Smart devices"]
55
66
article#projects.projects__projectsParent
77
div.projects__content

‎src/layout/projects/projects.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
.projects__tags {
4747
display: flex;
4848
justify-content: space-between;
49-
max-width: 450px;
49+
max-width: 650px;
5050
width: 100%;
5151
flex-wrap: wrap;
5252
padding-bottom: 5px;
@@ -180,7 +180,9 @@
180180
}
181181

182182
.statusbar__statusBar {
183+
display: flex;
183184
flex-wrap: wrap;
185+
justify-content: center;
184186
max-width: min(900px, 80vw);
185187
margin: 0 auto;
186188

@@ -193,6 +195,7 @@
193195
border: 3px #0066cc solid;
194196
display: inline-block;
195197
margin-right: 15px;
198+
margin-bottom: 15px;
196199

197200
&[active="true"] {
198201
background-color: #0066cc;
@@ -202,6 +205,7 @@
202205
@media (max-width: 700px) {
203206
& div:nth-child(n) {
204207
margin-right: 5px;
208+
margin-bottom: 5px;
205209
width: 5px;
206210
height: 5px;
207211
}

0 commit comments

Comments
 (0)