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

Correction de la largeur du menu latéral #759

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Correction de la largeur du menu latéral #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c878b2c
Fix side nav display bug
alinekeller Oct 22, 2024
79d4939
Fix nav aside width issue
alinekeller Oct 23, 2024
6bdd07e
Merge branch 'dev' into styleguide/nav-aside-width
williambelle Nov 28, 2024
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
22 changes: 16 additions & 6 deletions assets/components/organisms/nav-aside/nav-aside.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,36 @@
flex-wrap: nowrap;
margin-top: $spacer;

.nav-aside-wrapper {
& > .nav-container,
& > .nav-aside-wrapper {
flex: 0 0 22%;
order: -1;
max-width: 22%;
min-width: 320px;
border-right: 1px solid gray('200');
}

& > .nav-container:not( :has( .nav-aside-wrapper ) ) {
border: 0;
min-width: 0;
flex-basis: 0;
}

.content {
flex: 1 1 auto;
.container { width: 90%; }
}
}
}

.nav-aside-layout > .nav-container,
.nav-aside-layout > .nav-aside-wrapper {
@include media-breakpoint-up(xxl){
flex: 0 0 16.1%;
max-width: 16.1%;
}
}

.nav-aside-layout .nav-aside-wrapper {
display: block;

Expand All @@ -42,11 +57,6 @@
@include media-breakpoint-up(xl) {
height: 100%;
}

@include media-breakpoint-up(xxl){
flex: 0 0 16.1%;
max-width: 16.1%;
}
}

.nav-aside {
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/basic-page/basic-page.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block header %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/campus/campus.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block content %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/education/education.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block content %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/facultes/facultes.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% set nav_aside_items = [{
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/innovation/innovation.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block content %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/lab-homepage/lab-homepage.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% set hasTaggedBreadcrumb = true %}

{% extends "@templates/base/base.twig" %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/programs/programs.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block grid %}{% endblock %}
Expand Down
1 change: 1 addition & 0 deletions assets/components/pages/research/research.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block content %}
Expand Down
2 changes: 1 addition & 1 deletion assets/components/pages/study-plan-course/study-plan-course.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set isSpecial = true %}
{% set isSpecial = false %}

{% extends "@templates/base/base.twig" %}

Expand Down
2 changes: 1 addition & 1 deletion assets/components/pages/study-plan/study-plan.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

{% set isSpecial = false %}
{% extends "@templates/base/base.twig" %}

{% block header %}
Expand Down
Loading