diff --git a/changelog.md b/changelog.md index 8dc39bde93..4f2b739193 100644 --- a/changelog.md +++ b/changelog.md @@ -7,6 +7,8 @@ * [TabButton][VerticalTabButton]: decreased paddings, added gaps `3px` between internal items for all sizes according to design * [Tag]: changed layout - added gaps between internal items, changed padding * [Data Sources]: cursor-based pagination support. More details [here](http://uui.epam.com/documents?id=dataSources-lazy-dataSource&mode=doc&category=dataSources&theme=loveship#using_cursor-based_pagination) +* [TimelineScale]: added bottom/top month text customisation. +* [TimelineScale]: customisation of today line height was added. * [DataTable]: groups of columns. **What's Fixed** diff --git a/epam-assets/theme/theme_eduverse_dark.scss b/epam-assets/theme/theme_eduverse_dark.scss index 44d7fb280a..b36631aae0 100644 --- a/epam-assets/theme/theme_eduverse_dark.scss +++ b/epam-assets/theme/theme_eduverse_dark.scss @@ -9,6 +9,7 @@ @mixin theme-eduverse_dark { --uui-font: 'Inter', sans-serif; --uui-font-mono: 'Roboto Mono', monospace; + --font-museo-sans: 'Museo Sans', 'Source Sans Pro', Arial, sans-serif; /* shadows */ --uui-shadow-level-1: 0 0 4px rgba(0, 0, 0, 0.2), 0 3px 6px rgba(0, 0, 0, 0.2); @@ -175,6 +176,20 @@ --uui-accordion-toggler-border: var(--uui-divider-light); } + .uui-accordion-toggler { + --uui-accordion-toggler-font: var(--font-museo-sans); + --uui-accordion-toggler-font-weight: 500; + } + + /* Modals */ + + .uui-modal-title { + --uui-modals-title-font: var(--font-museo-sans); + --uui-modals-title-font-weight: 500; + --uui-modals-title-font-size: 28px; + --uui-modals-title-line-height: 36px; + } + /* FileCard */ .uui-file_card { @@ -805,25 +820,44 @@ /* Typography */ .uui-typography { - .uui-highlight { - background-color: var(--uui-warning-20); + h1, h2, h3, h4, h5, h6 { + font-family: var(--font-museo-sans); + letter-spacing: unset; } h1 { - font-weight: 600; + font-size: 64px; + line-height: 72px; + font-weight: 700; } h2 { + font-size: 36px; + line-height: 42px; font-weight: 700; } h3 { - font-weight: 600; + font-size: 32px; + line-height: 36px; + font-weight: 700; } - .hero-header { - font-size: 72px; - line-height: 72px; + h4 { + font-size: 28px; + line-height: 36px; + font-weight: 500; + } + + h5 { + font-size: 24px; + line-height: 32px; + font-weight: 700; + } + + h6 { + font-size: 14px; + line-height: 24px; font-weight: 700; } } diff --git a/epam-assets/theme/theme_eduverse_light.scss b/epam-assets/theme/theme_eduverse_light.scss index c8ca402975..0b18583097 100644 --- a/epam-assets/theme/theme_eduverse_light.scss +++ b/epam-assets/theme/theme_eduverse_light.scss @@ -10,6 +10,7 @@ @mixin theme-eduverse_light { --uui-font: 'Inter', sans-serif; --uui-font-mono: 'Roboto Mono', monospace; + --font-museo-sans: 'Museo Sans', 'Source Sans Pro', Arial, sans-serif; --gradient-1: linear-gradient(90deg, #00FFD3 0%, #00F6FF 44.22%, #B896FF 90%); --gradient-2: linear-gradient(152deg, #0078C2 8.13%, #0047FF 59.98%, #8453D2 91.87%); @@ -175,6 +176,20 @@ --uui-accordion-border-radius: 6px; } + .uui-accordion-toggler { + --uui-accordion-toggler-font: var(--font-museo-sans); + --uui-accordion-toggler-font-weight: 500; + } + + /* Modals */ + + .uui-modal-title { + --uui-modals-title-font: var(--font-museo-sans); + --uui-modals-title-font-weight: 500; + --uui-modals-title-font-size: 28px; + --uui-modals-title-line-height: 36px; + } + /* FileCard */ .uui-file_card { @@ -476,42 +491,45 @@ /* Typography */ .uui-typography { - h1 { - font-weight: 400; + h1, h2, h3, h4, h5, h6 { + font-family: var(--font-museo-sans); + letter-spacing: unset; } - h2, h3, h4, h5 { - font-weight: 600; - } - - .promo-header:is(h1, h2, h3, h4, h5, h6) { - font-family: var(--uui-font); - } - - h1.promo-header { - font-size: 72px; - font-weight: 400; + h1 { + font-size: 64px; + line-height: 72px; + font-weight: 700; } - h2.promo-header { - font-size: 44px; - font-weight: 600; + h2 { + font-size: 36px; + line-height: 42px; + font-weight: 700; } - h3.promo-header { - font-size: 36px; + h3 { + font-size: 32px; + line-height: 36px; + font-weight: 700; } - h4.promo-header { - font-size: 30px; + h4 { + font-size: 28px; + line-height: 36px; + font-weight: 500; } - h5.promo-header { + h5 { font-size: 24px; + line-height: 32px; + font-weight: 700; } - h6.promo-header { - font-size: 18px; + h6 { + font-size: 14px; + line-height: 24px; + font-weight: 700; } } } diff --git a/next-demo/next-app/src/components/Modal.tsx b/next-demo/next-app/src/components/Modal.tsx index fc998573ee..09fb72ed03 100644 --- a/next-demo/next-app/src/components/Modal.tsx +++ b/next-demo/next-app/src/components/Modal.tsx @@ -37,7 +37,7 @@ export const BasicModalExample = (modalProps: IModal) => {