Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FEATURE: new light site design #60

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

FEATURE: new light site design #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d858fba
TASK: update main page style
zaveryukha Apr 1, 2019
35b82c6
TASK: Main paga redesign
zaveryukha Apr 4, 2019
c8e0ed1
TASK: slider tuning for small screen
zaveryukha May 1, 2019
dacb27d
Merge branch 'master' into site_design
zaveryukha May 1, 2019
6c888c8
TASK: optimize SVG
zaveryukha May 3, 2019
d8810cf
TASK: fix media min-width
zaveryukha May 3, 2019
f257474
Merge remote-tracking branch 'origin/site_design' into site_design
zaveryukha May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...butionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PrimarySection.Short.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ prototype(Sfi.Kateheo:PrimarySection.Short) < prototype(Neos.Neos:ContentCompone
renderer = 'flex-basis: 50%; padding: 12px'
}
}
arrowFrame = Neos.Fusion:ResourceUri {
path = 'resource://Sfi.Kateheo/Public/Images/ArrowFrame.svg'
}
renderer = afx`
<div class={'mode-' + mode}>
{props.style}
<a href={props.nodeUri} class={'primarySection primarySection' + node.name + (currentSection == node && ' isCurrent')}>
<div class='primarySection-inner'>
<p class={(mode == 'section' ? 'H2' : 'H1') + ' color-white primarySection-title'} style="text-transform: uppercase; text-align: center"><Neos.Neos:Editable property="title" block={false} /></p>
<p @if.onlyMain={mode != 'section'} class="primarySection-description ServiceEm--Large color-white textAlign-center"><Neos.Neos:Editable property="description" block={false} /></p>
<div style="margin: 12px auto; border: 2px solid white; color: white; font-size: 20px; width: 100px; text-align: center;">⟶</div>
<div style="margin: 12px auto; font-size: 20px; width: 100px; text-align: center;"><img src={props.arrowFrame}/></div>
</div>
</a>
</div>
Expand Down
22 changes: 15 additions & 7 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Slide.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,43 @@ prototype(Sfi.Kateheo:Slide) < prototype(Neos.Neos:ContentComponent) {
name = ${node.properties.name}
renderer = afx`
<div class="backgroundColor-kateheo" style="display: flex; padding-right: 72px">
<div class="Slide-image" style="min-width: 72px"><img style="display: none" alt={props.name} src={props.imageUri}/></div>
<div class="Slide-image" style="min-width: 72px"><img alt={props.name} src={props.imageUri}/></div>
<div style="display: flex; align-items: center; margin: 36px 0">
<div>
<div class="Slide-text"><Neos.Neos:Editable property="text"/></div>
<div style="margin-top: 12px">
<span class="Slide-name"><Neos.Neos:Editable property="name" block={false}/>, </span><span class="Slide-about"><Neos.Neos:Editable property="about" block={false}/></span>
<div class="Slide-text"><Neos.Neos:Editable property="text"/>
<div style="margin-top: 12px">
<span class="Slide-name"><Neos.Neos:Editable property="name" block={false}/>, </span><span class="Slide-about"><Neos.Neos:Editable property="about" block={false}/></span>
</div>
</div>
</div>
</div>
</div>
`
@process.styles = ${'<style>
@media screen and (min-width: 640px) {
.Slide-image {
display: none;
}

@media screen and (min-width: 900px) {
.Slide-image {
flex-shrink: 0;
align-self: flex-end;
}
.Slide-image img {
.Slide-image {
display: block !important;
}
}
.Slide-text {
font-family: var(--fontFamily-main);
line-height: var(--lineHeight-normal);
font-size: 16px;
padding-left: 72px;
}
@media screen and (min-width: 640px) {

@media screen and (min-width: 900px) {
.Slide-text {
font-size: 21px;
padding-left: 0px;
}
}
.Slide-name {
Expand Down
6 changes: 3 additions & 3 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Header.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ prototype(Sfi.Kateheo:Header) < prototype(Neos.Fusion:Component) {
title = ${site.properties.title}
siteSubTitle = ${site.properties.siteSubTitle}
renderer = afx`
<header style="margin-bottom: 36px; border-bottom: 1px solid var(--color-grayLine)">
<div style="display:flex; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #e6e6e6;">
<header style="color: var(--color-grayLight); margin-bottom: 36px; border-bottom: 1px solid var(--color-grayLine)">
<div style="display:flex; border-bottom-style: solid; border-bottom: 1px solid var(--color-grayLine);">
<div href="#menu" class="marginLeft-single MobileNav-Toggle js-MobileNav-Toggle">
<div class="IconMenu">
<img alt="Меню" src={props.iconMenu}/>
Expand Down Expand Up @@ -57,7 +57,7 @@ prototype(Sfi.Kateheo:Header) < prototype(Neos.Fusion:Component) {
renderer = afx`
{props.style}
<header>
<div style="display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; padding: 0 12px; border-bottom-style: solid; border-bottom-width: 1px; border-bottom-color: #e6e6e6;">
<div style="color: var(--color-grayLight); display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; padding: 0 12px; border-bottom: 1px solid var(--color-grayLine);">
<div><Sfi.Kateheo:PrimaryMenu/></div>
<div>
<Sfi.Kateheo:SecondaryMenu/>
Expand Down
2 changes: 1 addition & 1 deletion DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/PrimaryMenu.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ prototype(Sfi.Kateheo:PrimaryMenu) < prototype(Neos.Fusion:Collection) {
itemName = 'node'
itemRenderer = Neos.Fusion:Tag {
tagName = 'a'
attributes.style = 'margin: 12px; display: inline-block;'
attributes.style = 'margin: 12px; display: inline-block; font-size: 16px;'
attributes.class = Neos.Fusion:RawArray {
main = 'H4 primaryMenu-item'
active = ${(documentNode == node || q(documentNode).parents('[_identifier = "' + node.identifier + '"]').count() > 0) && 'isCurrent'}
Expand Down
2 changes: 1 addition & 1 deletion DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/SecondaryMenu.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ prototype(Sfi.Kateheo:SecondaryMenu) < prototype(Neos.Fusion:Collection) {
itemName = 'node'
itemRenderer = Neos.Fusion:Tag {
tagName = 'a'
attributes.style = 'margin: 12px; display: inline-block;'
attributes.style = 'margin: 12px; display: inline-block; font-size: 10px;'
attributes.class = Neos.Fusion:RawArray {
main = 'Service--Small secondaryMenu-item'
active = ${(documentNode == node || q(documentNode).parents('[_identifier = "' + node.identifier + '"]').count() > 0) ? 'isCurrent' : ''}
Expand Down
12 changes: 6 additions & 6 deletions DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/ServiceLinks.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ prototype(Sfi.Kateheo:ServiceLinks) < prototype(Neos.Fusion:Component) {
}

iconUser = Neos.Fusion:ResourceUri {
path = 'resource://Sfi.Kateheo/Public/Images/IconUser.svg'
path = 'resource://Sfi.Kateheo/Public/Images/IconUserKateheo.svg'
}

iconSearch = Neos.Fusion:ResourceUri {
path = 'resource://Sfi.Kateheo/Public/Images/IconSearch.svg'
path = 'resource://Sfi.Kateheo/Public/Images/IconSearchKateheo.svg'
}

archiveUri = Neos.Neos:NodeUri {
node = ${q(site).children('[uriPathSegment = "archiv"]').get(0)}
}

renderer = afx`
<a title="Вход" href={props.loginLink} style="border-right: 1px solid black; margin-left: 24px; padding: 0 4px;">
<img src={props.iconUser} />
<a title="Вход" href={props.loginLink} style="border-right: 1px solid black; padding: 0 4px;">
<img src={props.iconUser} style="width: 36px"/>
</a>
<a class="js-headerSearch-toggle" title="Поиск" href={props.archiveUri} style="position: relative; left: -1px; padding: 12px">
<img src={props.iconSearch} />
<a class="js-headerSearch-toggle" title="Поиск" href={props.archiveUri} style="position: relative; left: -1px; padding-left: 12px;">
<img src={props.iconSearch} style="width: 18px"/>
</a>
`
}
Expand Down
2 changes: 1 addition & 1 deletion DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/OverrideStock.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ prototype(Neos.NodeTypes:TextWithImage) {

prototype(Psmb.Carousel:Carousel) {
arrowPrev = '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve"><style type="text/css"> .st0{fill:none;stroke:#1D1D1B;stroke-width:3;stroke-miterlimit:10;}</style><polyline class="st0" points="33.51,7.11 15.25,25 33.51,42.89 "/></svg>'
arrowNext = '<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve"><style type="text/css"> .st0{fill:none;stroke:#1D1D1B;stroke-width:3;stroke-miterlimit:10;}</style><polyline class="st0" points="16.49,7.11 34.75,25 16.49,42.89 "/></svg>'
arrowNext = '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve"><style type="text/css"> .st0{fill:none;stroke:#1D1D1B;stroke-width:3;stroke-miterlimit:10;}</style><polyline class="st0" points="16.49,7.11 34.75,25 16.49,42.89 "/></svg>'
}

prototype(Neos.Fusion:GlobalCacheIdentifiers) {
Expand Down
1 change: 1 addition & 0 deletions DistributionPackages/Sfi.Kateheo/Resources/Public/Images/ArrowFrame.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions DistributionPackages/Sfi.Kateheo/Resources/Public/Images/IconSearchKateheo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions DistributionPackages/Sfi.Kateheo/Resources/Public/Images/IconUserKateheo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.