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

#544756: [templates/nextjs-sxa] 544756 fix font awesome. fixed styles #1546

Merged
merged 4 commits into from
Jun 30, 2023
Merged

#544756: [templates/nextjs-sxa] 544756 fix font awesome. fixed styles #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7764b34
 #544756: changed CHANGELOG
sc-ruslanmatkovskyi Jun 23, 2023
ae4711f
 #544756: changed CHANGELOG
sc-ruslanmatkovskyi Jun 30, 2023
2e582b3
#544756: [templates/nextjs-sxa] fixed styles of navigation
sc-ruslanmatkovskyi Jun 30, 2023
e3d505e
#544756: changed CHANGELOG
sc-ruslanmatkovskyi Jun 30, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Our versioning strategy is as follows:
### 🐛 Bug Fixes

* `[templates/nextjs-sxa]` Fix font awesome - added CDN instead of using node_modules(problem with CORS) ([#1536](https://github.com/Sitecore/jss/pull/1536) ([#1545](https://github.com/Sitecore/jss/pull/1545))
* `[templates/nextjs-sxa]` Fix menu component of third-level menu. ([#1540](https://github.com/Sitecore/jss/pull/1540))
* `[templates/nextjs-sxa]` Fix menu component of third-level menu. ([#1540](https://github.com/Sitecore/jss/pull/1540)) ([#1546](https://github.com/Sitecore/jss/pull/1546))
* `[sitecore-jss-react]` [FEaaS] Prevent extra components client-side requests for SSR ([1541](https://github.com/Sitecore/jss/pull/1541))
* `[sitecore-jss-nextjs]` Referrer is not captured by Personalize middleware ([#1542](https://github.com/Sitecore/jss/pull/1542))

Expand Down
262 changes: 143 additions & 119 deletions ...extjs-sxa/src/assets/sass/components/navigation/_navigation-main-horizontal-vertical.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,146 +7,170 @@ $borderSize: 2px;

//Drop Down Navigation Common Part
.navigation.navigation-main {
.component-content>nav {
position: relative;
ul {
@include clearfix();
}
.component-content > nav {
position: relative;
ul {
@include clearfix();
}
}
.rel-level1 {
float: left;
&.active {
>.navigation-title>a {
border-color: $nav-border-root;
}
float: left;
&.active {
> .navigation-title > a {
border-color: $nav-border-root;
}
>.navigation-title>a {
border-width: 2px 0 0 0;
border-color: transparent;
&:hover {
border-color: $nav-border-root;
}
}
> .navigation-title > a {
border-width: 2px 0 0 0;
border-color: transparent;
&:hover {
border-color: $nav-border-root;
}
&.submenu {
>.navigation-title a {
position: relative;
padding-right: 15px;
&:after {
@include fa-icon();
font-size: 10px;
content: $fa-var-chevron-down;
position: absolute;
transform: translateY(-50%);
top: 50%;
right: 0;
}
}
}
//submenu
>ul {
overflow: hidden;
display: none;
z-index: 10;
}
&.submenu {
> .navigation-title a {
position: relative;
padding-right: 15px;
&:after {
@include fa-icon();
font-size: 10px;
content: $fa-var-chevron-down;
position: absolute;
top: 100%;
background: $nav-bg-submenu;
margin-left: 0;
margin-top: -$borderSize;
border-top: $borderSize solid $nav-border-submenu;
border-left: 1px solid $nav-submenu-item-border;
border-bottom: 1px solid $nav-submenu-item-border;
transform: translateY(-50%);
top: 50%;
right: 0;
}
}
&:active, &:hover {
>a {
&+ul {
display: block !important;
}
}
>ul {
display: block !important;
min-width: 60px;
}
}
//submenu
> ul {
overflow: hidden;
display: none;
z-index: 10;
position: absolute;
top: 100%;
background: $nav-bg-submenu;
margin-left: 0;
margin-top: -$borderSize;
border-top: $borderSize solid $nav-border-submenu;
border-left: 1px solid $nav-submenu-item-border;
border-bottom: 1px solid $nav-submenu-item-border;
}
&:active,
&:hover {
> a {
& + ul {
display: block !important;
}
}
&.active {
>.navigation-title>a:link, >.navigation-title>a:visited {
color: $text-basic-active;
}
>span {
display: block;
padding: 10px 20px;
color: $text-white;
}
> ul {
display: block !important;
min-width: 60px;
}
&.submenu.active {
border-color: $menu-active-color;
}
&.active {
> .navigation-title > a:link,
> .navigation-title > a:visited {
color: $text-basic-active;
}
> span {
display: block;
padding: 10px 20px;
color: $text-white;
}
}
&.submenu.active {
border-color: $menu-active-color;
}
}
.rel-level2 {
&:hover, &:focus {
transition: background .2s ease-in;
background: $nav-bg-submenu-active;
&:hover,
&:focus {
transition: background 0.2s ease-in;
background: $nav-bg-submenu-active;
}
div > a {
display: block;
font-weight: normal;
font-size: $navigation-font-basic-submenu;
text-align: center;
&:hover,
&:focus {
color: $nav-color-submenu;
}
div>a {
display: block;
font-weight: normal;
font-size: $navigation-font-basic-submenu;
text-align: center;
&:hover, &:focus {
color: $nav-color-submenu;
}
}
&.submenu {
box-sizing: border-box;
&.navigation-image {
text-align: center;
>a, .field-navigationtext {
text-align: left;
}
}
}
&.submenu {
box-sizing: border-box;
&.navigation-image {
text-align: center;
> a,
.field-navigationtext {
text-align: left;
}
}
}
}
// Additional styles fot drop down horizontal navigation
// Additional styles fot drop down horizontal navigation
&.navigation-main-horizontal {
.submenu>ul {
padding-left: 0;
}
.rel-level1 {
&:active, &:hover {
>a {
&+ul {
display: inline-flex !important;
flex-wrap: wrap;
}
}
>ul {
display: inline-flex !important;
flex-wrap: wrap;
}
}
>ul {
width: 100%;
clear: both;
left: 0;
.submenu > ul {
padding-left: 0;
}
.rel-level1 {
&:active,
&:hover {
> a {
& + ul {
display: inline-flex !important;
flex-wrap: wrap;
}
}
> ul {
display: inline-flex !important;
flex-wrap: wrap;
}
}
.rel-level2 {
float: left;
padding: 10px;
@include border-basic(right, $nav-submenu-item-border, 1px);
flex-grow: 1;
flex-basis: 23%;
> ul {
width: 100%;
clear: both;
left: 0;
}
}
.rel-level2 {
float: left;
padding: 10px;
@include border-basic(right, $nav-submenu-item-border, 1px);
flex-grow: 1;
flex-basis: 23%;
}
}
// Additional styles fot drop down vertical navigation
// Additional styles fot drop down vertical navigation
&.navigation-main-vertical {
.rel-level1>ul {
padding-left: 0;
width: auto;
left: auto;
@include border-basic(right, $nav-submenu-item-border, 1px);
>li {
padding: 5px 10px;
.rel-level1 > ul {
padding-left: 0;
width: auto;
left: auto;
@include border-basic(right, $nav-submenu-item-border, 1px);
> li {
padding: 5px 10px;
}
}
.submenu {
ul {
li {
a:before {
@include fa-icon();
content: $fa-var-chevron-right;
display: block;
position: absolute;
left: 0;
font-size: 10px;
top: 18px;
transform: translateY(-50%);
padding-left: 7px;
}
}
}
}
}
}

Loading