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

[BUGFIX] fixe la navigation #775

Merged
merged 2 commits into from
Nov 29, 2024
Merged

[BUGFIX] fixe la navigation #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db378fe
fix(navigation): improve navigation width
lionelB Nov 29, 2024
25c8af3
fix(pix-structure-switcher): avoid stop event while menu not open
xav-car Nov 29, 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
4 changes: 4 additions & 0 deletions addon/components/pix-structure-switcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ export default class PixStructureSwitcher extends Component {

@action
openMenu(event) {
if (this.isMenuOpen) return;

event.preventDefault();
this.isMenuOpen = true;
}

@action
closeMenu(event) {
if (!this.isMenuOpen) return;

event.preventDefault();
this.isMenuOpen = false;
}
Expand Down
4 changes: 1 addition & 3 deletions addon/styles/_pix-app-layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
.pix-app-layout {
--pix-navigation-width: 13.375rem;

display: grid;
grid-template-columns: var(--pix-navigation-width) 1fr;
grid-template-columns: min-content 1fr;
gap: var(--pix-spacing-6x);
padding: var(--pix-spacing-6x);

Expand Down
15 changes: 10 additions & 5 deletions addon/styles/_pix-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.pix-navigation {
--bg-color-focus: rgb(var(--pix-neutral-100-inline), 50%);
--bg-color-active: rgb(var(--pix-neutral-100-inline), 30%);

--pix-navigation-width: 15rem;

position: sticky;
bottom: var(--pix-spacing-6x);
z-index: 1;
display: flex;
flex-direction: column;
gap:var(--pix-spacing-6x);
align-items: center;
align-items: stretch;
justify-content: space-between;
min-width: var(--pix-navigation-width);
width: var(--pix-navigation-width);
height: auto;
min-height: calc(100vh - var(--pix-spacing-6x) * 2);

Expand All @@ -29,6 +29,7 @@
flex-direction: column;
align-items: stretch;
width: 100%;
max-width: none;
min-height: auto;
padding: 0;

Expand All @@ -44,15 +45,17 @@
line-height: 0;

img {
display: block;
width: 132px;
height: 48px;
margin:0 auto;
}

@include device-is('mobile') {
display:flex;
flex-direction: row;
align-items: center;
padding: var(--pix-spacing-4x) var(--pix-spacing-2x) var(--pix-spacing-4x) var(--pix-spacing-10x);
padding: var(--pix-spacing-4x) var(--pix-spacing-2x) var(--pix-spacing-4x) var(--pix-spacing-9x);

img {
width: 85px;
Expand Down Expand Up @@ -120,7 +123,7 @@
@extend %pix-body-s;

p {
word-break: break-all;
word-break: break-word;
}

@include device-is('mobile') {
Expand All @@ -142,6 +145,8 @@

.pix-button {
width: 100%;
padding: var(--pix-spacing-2x) var(--pix-spacing-4x);
white-space: unset;

@include device-is('mobile') {
width: auto;
Expand Down
1 change: 1 addition & 0 deletions addon/styles/pix-design-tokens/_spacing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ $pix-spacing-xxl: 48px;
--pix-spacing-4x: 16px;
--pix-spacing-6x: 24px;
--pix-spacing-8x: 32px;
--pix-spacing-9x: 36px;
--pix-spacing-10x: 40px;
--pix-spacing-12x: 48px;
}
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</p>
<p>{{this.structure.label}}</p>
<PixStructureSwitcher
@label="Changer de structure"
@label="Changer d'organisation"
@structures={{this.structures}}
@value={{this.structure.value}}
@onChange={{this.setStructure}}
Expand Down