From 5f676e8f6f7807aa703d758172523a7d5a359a16 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Thu, 23 Jun 2022 09:57:32 +0300 Subject: [PATCH 1/5] #539379: fixed style for new structure of basic site --- .../nextjs-sxa/src/assets/basic/_about.scss | 12 ++- .../nextjs-sxa/src/assets/basic/_common.scss | 79 ++++++++++--------- .../nextjs-sxa/src/assets/basic/_footer.scss | 23 ++++-- .../nextjs-sxa/src/assets/basic/_header.scss | 15 ++-- .../src/assets/basic/_navigation.scss | 3 +- .../nextjs-sxa/src/assets/basic/_promo.scss | 43 ++++++---- .../src/assets/basic/_rich-text.scss | 2 +- .../nextjs-sxa/src/components/Container.tsx | 5 +- 8 files changed, 106 insertions(+), 76 deletions(-) diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss index 56e5b1b7fa..2234e47e42 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss @@ -1,15 +1,13 @@ @import "variables"; -.about-page { - padding-bottom: 20px; - - .title { +.rich-text { + h1 { display: block; - font-size:$text-size-36; + font-size: $text-size-36; font-weight: 600; - line-height: 72px; } - .text { + + span { display: block; font-size: $text-size-16; font-weight: 500; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss index 3ee36d009f..09f5cb936c 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss @@ -7,7 +7,7 @@ main { position: relative; - min-height: calc(100vh - 352px); + min-height: calc(100vh - 421px); margin-bottom: 50px; padding-top: 50px; @@ -21,54 +21,57 @@ main { } .rich-text { - .main-header { - margin-bottom: 30px; - - @include respond-to(all-mobile) { - margin-bottom: 0px; - } - - .title { - font-size: $text-size-24; - font-weight: 500; - line-height: 50px; - margin-bottom: 30px; - - @include respond-to(all-mobile) { - font-size: $text-size-16; - line-height: 32px; - } - } - } - } - - .main-news { - padding-top: 50px; + margin-bottom: 30px; + margin-left: 100px; + max-width: 750px; @include respond-to(all-mobile) { - padding-top: 0; + margin-bottom: 0; + margin-left: 0; } - .title { - display: block; - font-size: $text-size-36; + h2 { + font-size: $text-size-24; font-weight: 500; - line-height: 62px; + line-height: 50px; + margin-bottom: 30px; @include respond-to(all-mobile) { - font-size: $text-size-18; - line-height: 22px; + font-size: $text-size-16; + line-height: 32px; + margin-bottom: 0; } } - .text { - font-size: $text-size-16; - font-weight: 500; - + &:nth-child(3) { + padding-top: 50px; + @include respond-to(all-mobile) { - font-size: $text-size-14; - line-height: 24px; - font-weight: 400; + padding-top: 10px; + } + + h2 { + display: block; + font-size: $text-size-36; + font-weight: 500; + line-height: 62px; + margin-bottom: 10px; + + @include respond-to(all-mobile) { + font-size: $text-size-18; + line-height: 22px; + } + } + + div { + font-size: $text-size-16; + font-weight: 500; + + @include respond-to(all-mobile) { + font-size: $text-size-14; + line-height: 24px; + font-weight: 400; + } } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss index 3df5ae5d43..55114db666 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss @@ -4,18 +4,31 @@ footer { position: absolute; width: 100%; - height: 231px; + height: 360px; + background-color: $bg-dark-gray; .rich-text { - font-size: $text-size-14; - color: $text-white; + @include respond-to(all-mobile) { + padding: 0 30px; + } + + p { + margin-bottom: 3px !important; + } + span { + font-size: $text-size-14; + color: $text-white !important; + } + a { + color: $text-white; + } } - .indent-inner { + .row { padding: 3rem; @include respond-to(all-mobile) { - padding: 25px 0; + padding: 50px 0 0; } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss index 575a7da05d..3ead158f81 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss @@ -11,7 +11,7 @@ header { .rich-text { padding-left: 50px; - h1 { + h1 span { font-size: $text-size-24; font-weight: 500; line-height: 18px; @@ -26,14 +26,17 @@ header { .rich-text { padding-left: 0; + padding-top: 0; text-align: center; - h1 { - font-size: $text-size-24; - font-weight: 600; - line-height: 29px; - padding-top: 0; + h1{ margin: 0; + span { + font-size: $text-size-24; + font-weight: 600; + line-height: 29px; + padding-top: 0; + } } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss index 8fb992481d..68ad97e063 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss @@ -6,10 +6,11 @@ $hamburger-height: 18px; $border-size: 6px; $hamburger-margin: 18px; -.navigation.navigation-horizontal { +.navigation { width: 100%; padding-right: 70px; margin-top: -15px; + text-align: right; .menu-mobile-navigate { display: none; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss index 4723a86d86..e9a4f459a6 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss @@ -3,29 +3,40 @@ /**PROMO**/ .promo { - &.promo-no-border { - padding-left: 0; - padding-right: 0; + padding-left: 0; + padding-right: 0; - >.component-content { - @include border-basic(all, 'none', 0); - @include respond-to(all-mobile) { - > div { - padding: 0; + >.component-content { + @include border-basic(all, 'none', 0); + + .promo-text { + max-width: 370px; + + .field-promotext { + h3 { + font-size: $text-size-18; + margin-bottom: 14px; } - - .promo-text { - padding: 15px 10px 10px 25px; + div { + margin: 20px 0; + font-size: $text-size-14; } } + } + + @include respond-to(all-mobile) { + > div { + padding: 0; + } .promo-text { - .field-promotext { - p { - margin: 10px 0; - } - } + padding: 0 30px; + max-width: 100%; } } + + img { + max-width: 580px; + } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss index 12d9fc47bc..548b29cfed 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss @@ -4,7 +4,7 @@ .rich-text { color: $text-gray; @include respond-to(all-mobile) { - padding: 15px 10px 10px 25px; + padding: 17px 30px 10px 30px; h2 { font-size: $text-size-18; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx index 2deca47f2a..5df2cb26c0 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/components/Container.tsx @@ -12,12 +12,13 @@ const BACKGROUND_REG_EXP = new RegExp( interface ComponentProps { rendering: ComponentRendering & { params: ComponentParams }; - params?: ComponentParams; + params: ComponentParams; } const Container = (props: ComponentProps): JSX.Element => { const { sitecoreContext } = useSitecoreContext(); - const styles = `${props.params.GridParameters} ${props.params?.Styles}`.trimEnd(); + const containerStyles = props.params && props.params.Styles ? props.params.Styles : ''; + const styles = `${props.params.GridParameters} ${containerStyles}`.trimEnd(); const phKey = `container-${props.params.DynamicPlaceholderId}`; const backgroundImage = props.params.BackgroundImage as string; let backgroundStyle: { [key: string]: string } = { backgroundImage: '' }; From e6312949f96087e3a42a6fd8b2ca6f9b898ec654 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Thu, 23 Jun 2022 15:57:29 +0300 Subject: [PATCH 2/5] #539379 changed styles and rebase --- .../nextjs-sxa/src/assets/basic/_about.scss | 16 ---- .../nextjs-sxa/src/assets/basic/_common.scss | 78 ------------------- .../src/assets/basic/_container.scss | 24 ++++++ .../nextjs-sxa/src/assets/basic/_footer.scss | 19 ++--- .../nextjs-sxa/src/assets/basic/_header.scss | 15 ++-- .../src/assets/basic/_navigation.scss | 3 +- .../nextjs-sxa/src/assets/basic/_promo.scss | 53 ++++++------- .../src/assets/basic/_rich-text.scss | 8 +- .../nextjs-sxa/src/assets/basic/main.scss | 5 +- 9 files changed, 68 insertions(+), 153 deletions(-) delete mode 100644 packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss delete mode 100644 packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss create mode 100644 packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_container.scss diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss deleted file mode 100644 index 2234e47e42..0000000000 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_about.scss +++ /dev/null @@ -1,16 +0,0 @@ -@import "variables"; - -.rich-text { - h1 { - display: block; - font-size: $text-size-36; - font-weight: 600; - } - - span { - display: block; - font-size: $text-size-16; - font-weight: 500; - line-height: 32px; - } -} diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss deleted file mode 100644 index 09f5cb936c..0000000000 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_common.scss +++ /dev/null @@ -1,78 +0,0 @@ -@import "@sass/abstracts/mixins"; -@import "variables"; - -* { - font-family: Roboto; -} - -main { - position: relative; - min-height: calc(100vh - 421px); - margin-bottom: 50px; - padding-top: 50px; - - @include respond-to(all-mobile) { - padding-top: 0; - margin-bottom: 0; - } - - #container { - margin-top: 60px; - } - - .rich-text { - margin-bottom: 30px; - margin-left: 100px; - max-width: 750px; - - @include respond-to(all-mobile) { - margin-bottom: 0; - margin-left: 0; - } - - h2 { - font-size: $text-size-24; - font-weight: 500; - line-height: 50px; - margin-bottom: 30px; - - @include respond-to(all-mobile) { - font-size: $text-size-16; - line-height: 32px; - margin-bottom: 0; - } - } - - &:nth-child(3) { - padding-top: 50px; - - @include respond-to(all-mobile) { - padding-top: 10px; - } - - h2 { - display: block; - font-size: $text-size-36; - font-weight: 500; - line-height: 62px; - margin-bottom: 10px; - - @include respond-to(all-mobile) { - font-size: $text-size-18; - line-height: 22px; - } - } - - div { - font-size: $text-size-16; - font-weight: 500; - - @include respond-to(all-mobile) { - font-size: $text-size-14; - line-height: 24px; - font-weight: 400; - } - } - } - } -} diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_container.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_container.scss new file mode 100644 index 0000000000..fdf175081c --- /dev/null +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_container.scss @@ -0,0 +1,24 @@ +@import "@sass/abstracts/mixins"; +@import "variables"; + +* { + font-family: Roboto; +} +h1 { + font-size: 36px; +} +.max-height { + .container { + margin-top: 60px; + } + position: relative; + min-height: calc(100vh - 388px); + margin-bottom: 50px; + padding-top: 50px; + + @include respond-to(all-mobile) { + padding-top: 0; + margin-bottom: 0; + } + +} diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss index 55114db666..0b04f90065 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_footer.scss @@ -4,31 +4,22 @@ footer { position: absolute; width: 100%; - height: 360px; - background-color: $bg-dark-gray; + height: 231px; .rich-text { - @include respond-to(all-mobile) { - padding: 0 30px; - } + font-size: $text-size-14; + color: $text-white; - p { - margin-bottom: 3px !important; - } - span { - font-size: $text-size-14; - color: $text-white !important; - } a { color: $text-white; } } - .row { + .indent-inner { padding: 3rem; @include respond-to(all-mobile) { - padding: 50px 0 0; + padding: 25px 0; } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss index 3ead158f81..575a7da05d 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_header.scss @@ -11,7 +11,7 @@ header { .rich-text { padding-left: 50px; - h1 span { + h1 { font-size: $text-size-24; font-weight: 500; line-height: 18px; @@ -26,17 +26,14 @@ header { .rich-text { padding-left: 0; - padding-top: 0; text-align: center; - h1{ + h1 { + font-size: $text-size-24; + font-weight: 600; + line-height: 29px; + padding-top: 0; margin: 0; - span { - font-size: $text-size-24; - font-weight: 600; - line-height: 29px; - padding-top: 0; - } } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss index 68ad97e063..8fb992481d 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss @@ -6,11 +6,10 @@ $hamburger-height: 18px; $border-size: 6px; $hamburger-margin: 18px; -.navigation { +.navigation.navigation-horizontal { width: 100%; padding-right: 70px; margin-top: -15px; - text-align: right; .menu-mobile-navigate { display: none; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss index e9a4f459a6..02c0a4b6ae 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss @@ -3,40 +3,35 @@ /**PROMO**/ .promo { - padding-left: 0; - padding-right: 0; + &.promo-no-border { + padding-left: 0; + padding-right: 0; - >.component-content { - @include border-basic(all, 'none', 0); - - .promo-text { - max-width: 370px; + >.component-content { + @include border-basic(all, 'none', 0); + + .promo-text { + .field-promotext { + font-size: 14px; - .field-promotext { - h3 { - font-size: $text-size-18; - margin-bottom: 14px; - } - div { - margin: 20px 0; - font-size: $text-size-14; + h3 { + font-size: 18px; + margin: 10px 0; + } + p { + margin: 10px 0; + } } } - } - - @include respond-to(all-mobile) { - > div { - padding: 0; - } - - .promo-text { - padding: 0 30px; - max-width: 100%; + @include respond-to(all-mobile) { + > div { + padding: 0; + } + + .promo-text { + padding: 15px 10px 10px 25px; + } } } - - img { - max-width: 580px; - } } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss index 548b29cfed..77940fb316 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_rich-text.scss @@ -3,8 +3,14 @@ .rich-text { color: $text-gray; + font-size: 16px; + + h4 { + line-height: 50px; + } + @include respond-to(all-mobile) { - padding: 17px 30px 10px 30px; + padding: 15px 30px 10px 25px; h2 { font-size: $text-size-18; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/main.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/main.scss index ddc2cd558f..2987a815de 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/main.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/main.scss @@ -1,10 +1,7 @@ -@import "common"; +@import "container"; @import "header"; @import "promo"; @import "navigation"; @import "component"; @import "rich-text"; @import "footer"; - -/**pages**/ -@import "about"; From f2f595a6007d37dacf6d1a569e11b0955a689bd4 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Fri, 24 Jun 2022 01:28:34 +0300 Subject: [PATCH 3/5] #539379 fixed loading fonts for production version --- .../src/templates/nextjs-sxa/src/assets/basic/_promo.scss | 2 +- .../src/templates/nextjs-sxa/src/assets/main.scss | 3 +++ .../src/templates/nextjs-sxa/src/pages/_app.tsx | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss index 02c0a4b6ae..4776896d83 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_promo.scss @@ -8,7 +8,7 @@ padding-right: 0; >.component-content { - @include border-basic(all, 'none', 0); + border: 0; .promo-text { .field-promotext { diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss new file mode 100644 index 0000000000..e9c58a7c63 --- /dev/null +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss @@ -0,0 +1,3 @@ +@import "bootstrap/dist/css/bootstrap.css"; +@import "sass/main.scss"; +@import "basic/main.scss"; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx index 5a8b1b3885..3a1a5efbfe 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx @@ -1,9 +1,8 @@ import type { AppProps } from 'next/app'; import { I18nProvider } from 'next-localization'; -import 'bootstrap/dist/css/bootstrap.css'; -import 'assets/sass/main.scss'; -import 'assets/basic/main.scss'; +import 'assets/main.scss'; +import 'assets/app.css'; function App({ Component, pageProps }: AppProps): JSX.Element { const { dictionary, ...rest } = pageProps; From da1fc90f6ed7b3940f6eeefca545c1883290726f Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Fri, 24 Jun 2022 07:22:16 +0300 Subject: [PATCH 4/5] #539379 [SXA] fixed mobile menu --- .../src/templates/nextjs-sxa/src/assets/basic/_navigation.scss | 1 + .../src/templates/nextjs-sxa/src/pages/_app.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss index 8fb992481d..7596336320 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/basic/_navigation.scss @@ -112,6 +112,7 @@ $hamburger-margin: 18px; } .component-content { + position: fixed; display: inline-block; } } diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx index 3a1a5efbfe..30c30fd834 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx @@ -1,6 +1,7 @@ import type { AppProps } from 'next/app'; import { I18nProvider } from 'next-localization'; +// in the main.css is the list of used css import 'assets/main.scss'; import 'assets/app.css'; From 4757d6ab83ec83e510c70393f1af601b64001504 Mon Sep 17 00:00:00 2001 From: Ruslan Matkovskyi Date: Fri, 24 Jun 2022 11:51:35 +0300 Subject: [PATCH 5/5] #539379 fixed comments --- .../src/templates/nextjs-sxa/src/assets/main.scss | 1 + .../src/templates/nextjs-sxa/src/pages/_app.tsx | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss index e9c58a7c63..baef1d397c 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/assets/main.scss @@ -1,3 +1,4 @@ @import "bootstrap/dist/css/bootstrap.css"; @import "sass/main.scss"; @import "basic/main.scss"; +@import "assets/app.css"; diff --git a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx index 30c30fd834..d1d67549c6 100644 --- a/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx +++ b/packages/create-sitecore-jss/src/templates/nextjs-sxa/src/pages/_app.tsx @@ -1,9 +1,7 @@ import type { AppProps } from 'next/app'; import { I18nProvider } from 'next-localization'; -// in the main.css is the list of used css import 'assets/main.scss'; -import 'assets/app.css'; function App({ Component, pageProps }: AppProps): JSX.Element { const { dictionary, ...rest } = pageProps;