diff --git a/web/ASC.Web.Components/src/components/page-layout/index.js b/web/ASC.Web.Components/src/components/page-layout/index.js index b7831431ea..20cbc37802 100644 --- a/web/ASC.Web.Components/src/components/page-layout/index.js +++ b/web/ASC.Web.Components/src/components/page-layout/index.js @@ -43,10 +43,9 @@ const StyledArticle = styled.article` const StyledArticleHeader = styled.div` border-bottom: 1px solid #ECEEF1; - font-weight: bold; - font-size: 27px; - line-height: 56px; height: 56px; + display: flex; + align-items: center; @media ${device.tablet} { display: ${props => props.visible ? 'block' : 'none'}; @@ -95,10 +94,13 @@ const StyledSection = styled.section` const StyledSectionHeader = styled.div` border-bottom: 1px solid #ECEEF1; - font-weight: bold; - font-size: 21px; - line-height: 56px; height: 56px; + display: flex; + align-items: center; + + & > * { + margin-right: 8px; + } `; const StyledSectionBody = styled.div` diff --git a/web/ASC.Web.Storybook/stories/layout/index.stories.js b/web/ASC.Web.Storybook/stories/layout/index.stories.js index c2b9c099dc..1a7b449554 100644 --- a/web/ASC.Web.Storybook/stories/layout/index.stories.js +++ b/web/ASC.Web.Storybook/stories/layout/index.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import { storiesOf } from '@storybook/react'; import { action } from '@storybook/addon-actions'; -import { Layout, PageLayout } from 'asc-web-components' +import { Layout, PageLayout, Text, IconButton, ContextMenuButton } from 'asc-web-components' const currentUser = { id: '00000000-0000-0000-0000-000000000000', @@ -87,9 +87,14 @@ const currentModuleId = '44444444-4444-4444-4444-444444444444'; const onLogoClick = (e) => {action('Logo Clicked')(e)}; const asideContent =

Aside Content

; -const articleHeaderContent = "Article Header"; +const articleHeaderContent = Article Header; const articleBodyContent =

Article Content

; -const sectionHeaderContent = "Section Header"; +const sectionHeaderContent = <> + alert('ProjectDocumentsUpIcon Clicked')} iconName={"ProjectDocumentsUpIcon"} /> + Section Header + alert('PlusIcon Clicked')} iconName={"PlusIcon"} /> + [{key: 'key', label: 'label', onClick: () => alert('label Clicked')}]} /> +; const sectionBodyContent =

Section Content

; storiesOf('Components|Layout', module)