diff --git a/assets/community-events/pic1.png b/assets/community-events/pic1.png new file mode 100644 index 0000000..d45af14 Binary files /dev/null and b/assets/community-events/pic1.png differ diff --git a/assets/community-events/pic2.png b/assets/community-events/pic2.png new file mode 100644 index 0000000..e557d9d Binary files /dev/null and b/assets/community-events/pic2.png differ diff --git a/assets/community-events/pic3.png b/assets/community-events/pic3.png new file mode 100644 index 0000000..9670111 Binary files /dev/null and b/assets/community-events/pic3.png differ diff --git a/assets/community-events/pic4.png b/assets/community-events/pic4.png new file mode 100644 index 0000000..d5315d3 Binary files /dev/null and b/assets/community-events/pic4.png differ diff --git a/assets/community-events/pic5.png b/assets/community-events/pic5.png new file mode 100644 index 0000000..58f317a Binary files /dev/null and b/assets/community-events/pic5.png differ diff --git a/assets/community-events/pic6.png b/assets/community-events/pic6.png new file mode 100644 index 0000000..742f4e5 Binary files /dev/null and b/assets/community-events/pic6.png differ diff --git a/assets/community-events/pic7.png b/assets/community-events/pic7.png new file mode 100644 index 0000000..28d17aa Binary files /dev/null and b/assets/community-events/pic7.png differ diff --git a/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.post.css b/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.post.css new file mode 100644 index 0000000..cd45bf0 --- /dev/null +++ b/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.post.css @@ -0,0 +1,3 @@ +.brand-logo_name_css-minsk-js { + background-image: url('brand-logo_name_css-minsk-js.svg'); +} diff --git a/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.svg b/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.svg new file mode 100644 index 0000000..273c531 --- /dev/null +++ b/common.blocks/brand-logo/_name/brand-logo_name_css-minsk-js.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common.blocks/community-events/community-events.bemhtml.js b/common.blocks/community-events/community-events.bemhtml.js index 2bd8fe2..a0fab26 100755 --- a/common.blocks/community-events/community-events.bemhtml.js +++ b/common.blocks/community-events/community-events.bemhtml.js @@ -1,93 +1,114 @@ block('community-events')( - content()(function(n, ctx) { - return { - elem: 'wrapper', - mix: [ - { block: 'pt-card', mods: { view: 'brand' }}, - { block: 'decorator', mods: { 'indent-b': '2xl'}} - ], - attrs: { style: 'background:#000; min-width: 320px;'}, - content: [ - { - elem: 'bg', - mix: { block: 'pt-card', elem: 'image', elemMods: { size: 'cover' }}, - content: [ - ] - }, - { - elem: 'content', - mix: { block: 'pt-card', elem: 'content', elemMods: { 'vertical-align': 'center', distribute: 'center', 'space-a': 'xl' }}, - content: [ - { - elem: 'info', - content: [ - { - elem: 'graphics', - mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, - content: [ - { - elem: 'userpic', - content: [ - { - block: 'avatar', - content: [ - { - elem: 'photo', - elemMods: { size: 'm' }, - content: [ - { - block: 'image', - url: ctx.speakerPicUrl, - width: 60 - } - ] - }, - ] - } - ] - }, - { - elem: 'conf-logo', - content: [ - { - block: 'brand-logo', - mods: { name: ctx.confName, size: 'm' } - }, - ] - }, - ] - }, - { - block: 'text', - mods: { size: '2xl', view: 'primary', align: 'center', weight: 'light' }, - attrs: { style: 'line-height: var(--line-height-typo-xl);' }, - mix: { block: 'decorator', mods: { 'indent-b': 's' }}, - content: ctx.speechName - }, - { - block: 'text', - mods: { size: 'm', view: 'secondary', align: 'center', font: 'sans', weight: 'light' }, - attrs: { style: 'width: 100%;' }, - content: ctx.additionalInfo - } - ] + content()(function (n, ctx) { + return { + elem: 'wrapper', + mix: [ + { block: 'pt-card' }, + { block: 'decorator', mods: { 'indent-b': '2xl' } } + ], + // attrs: { style: 'background:#000; min-width: 320px;' }, + // attrs: { style: `background: linear-gradient(180deg, rgba(0, 0, 0, 0.0001) 25.45%, rgba(30, 50, 62, 0.444599) 54.31%, #0D0E0F 100%), url(../../assets/community-events/${ctx.bgImg}); background-size: cover;` }, + content: [ + { + elem: 'bg', + mix: { block: 'pt-card', elem: 'image', elemMods: { size: 'cover' } }, + // attrs: { style: 'background-image: url(../../assets/community-events/pic1.jpg)' }, + content: [ + + ] + }, + { + elem: 'content', + mix: { block: 'pt-card', elem: 'content', elemMods: { 'vertical-align': 'center', distribute: 'center', 'space-a': 'xl' } }, + content: [ + { + elem: 'info', + content: [ + { + elem: 'graphics', + mix: { block: 'decorator', mods: { 'indent-b': 'xl' } }, + content: [ + { + elem: 'userpic', + content: [ + { + block: 'avatar', + content: [ + { + elem: 'photo', + elemMods: { size: 'm' }, + content: [ + { + block: 'image', + url: ctx.speakerPicUrl, + width: 60 + } + ] + } + ] + } + ] + }, + { + elem: 'conf-logo', + content: [ + { + block: 'brand-logo', + mods: { name: ctx.confName, size: 'm' } + } + ] + } + ] + }, + { + block: 'text', + mods: { size: '2xl', view: 'primary', align: 'center', weight: 'light' }, + attrs: { style: 'line-height: var(--line-height-typo-xl);' }, + mix: { block: 'decorator', mods: { 'indent-b': 's' } }, + content: ctx.speechName + }, + { + block: 'text', + mods: { size: 'm', view: 'secondary', align: 'center', font: 'sans', weight: 'light' }, + attrs: { style: 'width: 100%;' }, + content: ctx.additionalInfo + } + ] + } + ] + }, + { + elem: 'footer', + mix: { block: 'pt-card', elem: 'footer', elemMods: { distribute: 'center', 'space-a': 'xl' } }, + content: [ + { + elem: 'source-text', + tag: 'a', + attrs: { href: ctx.linkUrl }, + mix: { block: 'text', mods: { size: 'm', view: 'link', weight: 'light', align: 'center' } }, + content: ctx.linkText + }, + ( + function() { + if (ctx.linkText2 != undefined && ctx.linkUrl2 != undefined) { + return ( + { + elem: 'source-text', + tag: 'a', + attrs: { href: ctx.linkUrl2 }, + mix: [ + { block: 'text', mods: { size: 'm', view: 'link', weight: 'light', align: 'center' } }, + { block: 'decorator', mods: { 'indent-l': 'xl' } } + ], + content: ctx.linkText2 + } + ) + } } - ] - }, - { - elem: 'footer', - mix: { block: 'pt-card', elem: 'footer', elemMods: { distribute: 'center', 'space-a': 'xl' }}, - content: [ - { - elem: 'source-text', - tag: 'a', - attrs: { href: ctx.linkUrl } , - mix: { block: 'text', mods: { size: 'm', view: 'link', weight: 'light', align: 'center' }}, - content: ctx.linkText - } - ] - } - ] - } - }), + )() + ] + } + ] + } + }) ); diff --git a/common.blocks/community-events/community-events.deps.js b/common.blocks/community-events/community-events.deps.js index 435ad63..1e0a1b6 100755 --- a/common.blocks/community-events/community-events.deps.js +++ b/common.blocks/community-events/community-events.deps.js @@ -1,7 +1,6 @@ ([ { shouldDeps: [ - // брэнд лого может быть много { block: 'brand-logo', mods: { name: 'rit', size:'m' }}, { block: 'brand-logo', mods: { name: 'dribbble', size:'m' }}, @@ -9,18 +8,20 @@ { block: 'brand-logo', mods: { name: 'pitercss-meetup', size:'m' }}, { block: 'brand-logo', mods: { name: 'bemup', size:'m' }}, { block: 'brand-logo', mods: { name: 'webstandarts', size:'m' }}, + { block: 'brand-logo', mods: { name: 'css-minsk-js', size:'m' }}, { block: 'pt-card', mods: { view: 'brand' }}, - { block: 'decorator', mods: { 'indent-b': '2xl'}}, { block: 'pt-card', elem: 'image', mods: { size: 'cover' }}, { block: 'pt-card', elem: 'content', mods: { 'vertical-align': 'center', distribute: 'center', 'space-a': 'xl' }}, + { block: 'pt-card', elem: 'footer', mods: { distribute: 'center', 'space-a': 'xl' }}, + { block: 'decorator', mods: { 'indent-b': '2xl'}}, { block: 'decorator', mods: { 'indent-b': 'xl' }}, + { block: 'decorator', mods: { 'indent-l': 'xl' }}, + { block: 'decorator', mods: { 'indent-b': 's' }}, { block: 'avatar' }, { block: 'avatar', elem: 'photo', mods: { size:'m' }}, { block: 'text', mods: { size: '2xl', view: 'primary', align: 'center', weight: 'light' }}, - { block: 'decorator', mods: { 'indent-b': 's' }}, { block: 'text', mods: { size: 'm', view: 'secondary', align: 'center', font: 'sans', weight: 'light' }}, - { block: 'pt-card', elem: 'footer', mods: { distribute: 'center', 'space-a': 'xl' }}, { block: 'text', mods: { size: 'm', view: 'link', weight: 'light', align: 'center' }}, ] } diff --git a/common.blocks/community-events/community-events.post.css b/common.blocks/community-events/community-events.post.css index fe08d62..e7dc34c 100755 --- a/common.blocks/community-events/community-events.post.css +++ b/common.blocks/community-events/community-events.post.css @@ -1,6 +1,10 @@ .community-events { + &__wrapper { + min-width: 320px; + background-color: var(--color-bg-ghost); + } &__content { - min-height: 350px; + min-height: 320px; } &__info { display: flex; diff --git a/desktop.bundles/community/community.bemjson.js b/desktop.bundles/community/community.bemjson.js index 212ba16..b728c57 100755 --- a/desktop.bundles/community/community.bemjson.js +++ b/desktop.bundles/community/community.bemjson.js @@ -135,7 +135,6 @@ module.exports = { } ] } - ] }, /* Menu */ @@ -152,9 +151,9 @@ module.exports = { block: 'community-page', content: [ /* Social */ - { + { elem: 'social', - content: [ + content: [ { block: 'text', mix: { block: 'decorator', mods: { 'indent-b': '2xl' }}, @@ -171,7 +170,8 @@ module.exports = { content: [ { elem: 'social-wrapper', - attrs: { style: 'display:flex; align-items: center;' }, + tag: 'a', + attrs: { href: 'https://t.me/whitepapertools', style: 'text-decoration: none; display:flex; align-items: center;' }, mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, content: [ { @@ -180,17 +180,16 @@ module.exports = { }, { block: 'text', - tag: 'a', - attrs: { href: 'https://t.me/whitepapertools', style: 'text-decoration: none' }, mods: { view: 'primary', size: '3xl', view: 'primary', display: 'inline' }, mix: { block: 'decorator', mods: { 'indent-l': 'm' }}, content: 'Telegram' - }, + } ] }, { elem: 'social-wrapper', - attrs: { style: 'display:flex; align-items: center;' }, + tag: 'a', + attrs: { href: 'https://twitter.com/whitepapertools', style: 'text-decoration: none; display:flex; align-items: center;' }, mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, content: [ { @@ -199,14 +198,12 @@ module.exports = { }, { block: 'text', - tag: 'a', - attrs: { href: 'https://twitter.com/whitepapertools', style: 'text-decoration: none' }, mods: { view: 'primary', size: '3xl', view: 'primary', display: 'inline' }, mix: { block: 'decorator', mods: { 'indent-l': 'm' }}, content: 'Twitter' - }, + } ] - }, + } ] }, { @@ -215,7 +212,8 @@ module.exports = { content: [ { elem: 'social-wrapper', - attrs: { style: 'display:flex; align-items: center;' }, + tag: 'a', + attrs: { href: 'https://github.com/whitepapertools', style: 'text-decoration: none; display:flex; align-items: center;' }, mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, content: [ { @@ -224,17 +222,16 @@ module.exports = { }, { block: 'text', - tag: 'a', - attrs: { href: 'https://github.com/whitepapertools', style: 'text-decoration: none' }, mods: { view: 'primary', size: '3xl', view: 'primary', display: 'inline' }, mix: { block: 'decorator', mods: { 'indent-l': 'm' }}, content: 'Github' - }, + } ] }, { elem: 'social-wrapper', - attrs: { style: 'display:flex; align-items: center;' }, + tag: 'a', + attrs: { href: 'https://codepen.io/whitepapertools/', style: 'text-decoration: none; display:flex; align-items: center;' }, mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, content: [ { @@ -243,14 +240,12 @@ module.exports = { }, { block: 'text', - tag: 'a', - attrs: { href: 'https://codepen.io/whitepapertools/', style: 'text-decoration: none' }, mods: { view: 'primary', size: '3xl', view: 'primary', display: 'inline' }, mix: { block: 'decorator', mods: { 'indent-l': 'm' }}, content: 'Codepen' - }, + } ] - }, + } ] }, { @@ -259,7 +254,8 @@ module.exports = { content: [ { elem: 'social-wrapper', - attrs: { style: 'display:flex; align-items: center;' }, + tag: 'a', + attrs: { href: 'https://dribbble.com/whitepapertools', style: 'text-decoration: none; display:flex; align-items: center;' }, mix: { block: 'decorator', mods: { 'indent-b': 'xl' }}, content: [ { @@ -268,18 +264,16 @@ module.exports = { }, { block: 'text', - tag: 'a', - attrs: { href: 'https://dribbble.com/whitepapertools', style: 'text-decoration: none' }, mods: { view: 'primary', size: '3xl', view: 'primary', display: 'inline' }, mix: { block: 'decorator', mods: { 'indent-l': 'm' }}, content: 'Dribbble' - }, + } ] - }, + } ] - }, - ] - }, + } + ] + } ] }, /* Social */ @@ -302,13 +296,13 @@ module.exports = { content: [ { block: 'community-events', - speakerPicUrl: '/assets/team/ksusha.jpg', - confName: 'rit', // brand logo - speechName: 'Production ready design', - additionalInfo: 'Ксения Лушникова. Конференция РИТ++', - linkText: 'билеты на РИТ++ 2019', - linkUrl: 'https://ritfest.ru' - }, + speakerPicUrl: '/assets/team/vadik.jpg', + confName: 'css-minsk-js', // brand logo + speechName: 'Yet Another Talk About Design Systems', + additionalInfo: 'Вадик Матвеев. CSS MINSK JS', + linkText: 'CSS MINSK JS', + linkUrl: 'https://css-minsk-js.by/speaker/vadik-matveev' + } ] }, { @@ -319,12 +313,14 @@ module.exports = { speakerPicUrl: '/assets/team/ksusha.jpg', confName: 'pitercss-meetup', // brand logo speechName: 'Production ready design', - additionalInfo: 'Ксения Лушникова. pitercss meetup', - linkText: 'анонс выступления', - linkUrl: 'https://twitter.com/pitercss_meetup' + additionalInfo: 'Ксения Лушникова', + linkText: 'pitercss meetup', + linkUrl: 'https://youtu.be/QArmhI33zwY?t=2727', + linkText2: 'РИТ++ 2019', + linkUrl2: 'https://youtu.be/AJU9IyIC3cc' } ] - }, + } ] }, { @@ -339,9 +335,9 @@ module.exports = { confName: 'bemup', // brand logo speechName: 'BEMup', additionalInfo: 'Кирилл Федотов. Yandex', - linkText: 'анонс выступления', - linkUrl: 'https://events.yandex.ru/events/bemup/' - }, + linkText: '', + linkUrl: '' + } ] }, { @@ -357,7 +353,7 @@ module.exports = { linkUrl: 'https://www.youtube.com/watch?v=dhHlaiD0NZc&feature=youtu.be&t=7h37m1s' } ] - }, + } ] }, { @@ -374,16 +370,17 @@ module.exports = { additionalInfo: 'Михаил Колосков. Веб стандарты', linkText: 'смотреть запись', linkUrl: 'https://www.youtube.com/watch?v=YUKHcQJEELw' - }, + } ] }, { elem: 'fraction', content: [ + // заглушечный фрэкшн для сетки ] - }, + } ] - }, + } /* Events */ ] } @@ -657,7 +654,6 @@ module.exports = { ] } /* /Footer */ - ] } ] diff --git a/desktop.bundles/index/index.bemjson.js b/desktop.bundles/index/index.bemjson.js index 45ac4c6..2328264 100755 --- a/desktop.bundles/index/index.bemjson.js +++ b/desktop.bundles/index/index.bemjson.js @@ -1836,12 +1836,12 @@ module.exports = { { block: 'text', mods: { size: 'l', view: 'primary', weight: 'light' }, - content: 'Dribbble Meetup, 2018' + content: ' CSS MINSK JS, 2019' }, { block: 'text', mods: { size: 'l', view: 'primary', weight: 'light' }, - content: 'Санкт-Петербург' + content: 'Минск' } ] }, @@ -1852,7 +1852,7 @@ module.exports = { { block: 'text', mods: { size: 'l', view: 'primary', weight: 'light' }, - content: 'Web Standarts, 2018' + content: 'РИТ++, 2019' }, { block: 'text', diff --git a/static/hj1WnEluZwJiEFdcpyDSv5mkLt4.svg b/static/hj1WnEluZwJiEFdcpyDSv5mkLt4.svg new file mode 100644 index 0000000..273c531 --- /dev/null +++ b/static/hj1WnEluZwJiEFdcpyDSv5mkLt4.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +