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.

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

[FW][IMP] website: remove navbar extra padding #163996

Closed

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Apr 30, 2024

Description of the issue/feature this PR addresses:
In the mobile view, the header has extra padding, for this reason it is not perfectly aligned with the content of the page.

Current behavior before PR:

The header is not aligned with the content

Desktop Mobile
image image

Desired behavior after PR is merged:

The header is aligned with the content like desktop view

2024-04-28.09-07-05.mp4

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #163705

@robodoo
Copy link
Contributor

robodoo commented Apr 30, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 30, 2024

@imanie383 @qsm-odoo cherrypicking of pull request #163705 failed.

stdout:

Auto-merging addons/website/views/website_templates.xml
CONFLICT (content): Merge conflict in addons/website/views/website_templates.xml

stderr:

14:22:16.891596 git.c:463               trace: built-in: git cherry-pick c706f3af0adbe5a5fb0c29b0e9b2216649879517
error: could not apply c706f3af0adb... [IMP] website: remove navbar extra padding
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 30, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Apr 30, 2024
qsm-odoo added a commit to odoo-dev/odoo that referenced this pull request Apr 30, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996
robodoo pushed a commit that referenced this pull request Apr 30, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: f894094
[2]: df8535f

Related to #163996

closes #164014

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
fw-bot pushed a commit to odoo-dev/odoo that referenced this pull request Apr 30, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996

X-original-commit: 983131f
fw-bot pushed a commit to odoo-dev/odoo that referenced this pull request Apr 30, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996

X-original-commit: 983131f
fw-bot pushed a commit to odoo-dev/odoo that referenced this pull request Apr 30, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996

X-original-commit: 983131f
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996

closes odoo#164014

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
robodoo pushed a commit that referenced this pull request May 2, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: f894094
[2]: df8535f

Related to #163996

closes #164116

X-original-commit: 983131f
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
@qsm-odoo qsm-odoo force-pushed the master-17.0-nav-imanie383-J3FR-fw branch from 03fd205 to 2f35dda Compare May 2, 2024 16:30
*: web, portal

In the mobile view, the header has extra padding, for this reason it is
not perfectly aligned with the content of the page.

This also removes the navbar padding from the backend, it should not be
necessary either.

Thanks to imanie383 <manuel@vauxoo.com>
X-original-commit: b34ee26
@qsm-odoo qsm-odoo force-pushed the master-17.0-nav-imanie383-J3FR-fw branch from 2f35dda to ee1bb81 Compare May 2, 2024 16:33
@C3POdoo C3POdoo requested review from a team, Iucapad and BastienFafchamps and removed request for a team May 2, 2024 16:33
robodoo pushed a commit that referenced this pull request May 2, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: f894094
[2]: df8535f

Related to #163996

closes #164089

X-original-commit: 983131f
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
robodoo pushed a commit that referenced this pull request May 2, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: f894094
[2]: df8535f

Related to #163996

closes #164106

X-original-commit: 983131f
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Copy link
Contributor

@qsm-odoo qsm-odoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robodoo
Copy link
Contributor

robodoo commented May 6, 2024

@qsm-odoo you may want to rebuild or fix this PR as it has failed CI.

robodoo pushed a commit that referenced this pull request May 6, 2024
*: web, portal

In the mobile view, the header has extra padding, for this reason it is
not perfectly aligned with the content of the page.

This also removes the navbar padding from the backend, it should not be
necessary either.

Thanks to imanie383 <manuel@vauxoo.com>

closes #163996

X-original-commit: b34ee26
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
@robodoo robodoo closed this May 6, 2024
@robodoo robodoo added the 17.3 label May 6, 2024
@qsm-odoo qsm-odoo deleted the master-17.0-nav-imanie383-J3FR-fw branch May 7, 2024 16:11
zel-odoo pushed a commit to odoo-dev/odoo that referenced this pull request May 24, 2024
The portal mobile navbar menu was overflowing its parent (the navbar)
on the left and right once opened. This is because of a combination of
commits [1] and [2]. Indeed, [1] added a negative margin on that menu
to compensate the parent navbar's padding. However, [2] later forced
that parent padding to 0 with a class.

This commit removes the negative margin compensation to fix the issue.

Note: the design may not seem that broken without this fix. But in custo
it could look very bad as it could introduce a horizontal scrollbar:
just make the portal layout use a fluid container and have
`$navbar-padding-x` be higher than `$grid-gutter-width`.

Also, note that the design is not perfect as the inner padding of that
menu also relies on the navbar padding value... which is ok in Odoo but
only because we change the default of Bootstrap, which is 0. It was
chosen to ignore that problem in stable. In master, the navbar padding
will be left back to the BS default (0) and another spacing value will
thus be used for the portal menu.

[1]: odoo@f894094
[2]: odoo@df8535f

Related to odoo#163996

closes odoo#164116

X-original-commit: 983131f
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
zel-odoo pushed a commit to odoo-dev/odoo that referenced this pull request May 24, 2024
*: web, portal

In the mobile view, the header has extra padding, for this reason it is
not perfectly aligned with the content of the page.

This also removes the navbar padding from the backend, it should not be
necessary either.

Thanks to imanie383 <manuel@vauxoo.com>

closes odoo#163996

X-original-commit: b34ee26
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
17.3 conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants