Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 5, 2021

The previous makefile was compiling css beside the style.scss and
the style.css was copied at the end.

The new makefile compile css directly in the build dir.

Since this file was still present in the source because of the .gitignore,
sphinx was using this old version of style.css, overriding the new compiled
css file at the end.

Removing it from gitignore should helpFix this problem.

This commit also fix some path in makefile.
(not critical but this should fix a potential error in static command)

Forward-Port-Of: #1084

The previous makefile was compiling css beside the style.scss and
the style.css was copied at the end.

The new makefile compile css directly in the build dir.

Since this file was still present in the source because of the .gitignore,
sphinx was using this old version of style.css, overriding the new compiled
css file at the end.

Removing it from gitignore should helpFix this problem.

This commit also fix some path in makefile.
(not critical but this should fix a potential error in static command)

X-original-commit: fd56d8c
@robodoo
Copy link
Collaborator

robodoo commented Aug 5, 2021

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 5, 2021

This PR targets 14.0 and is part of the forward-port chain. Further PRs will be created up to master.

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

@robodoo robodoo closed this in 11c1180 Aug 5, 2021
@robodoo robodoo temporarily deployed to merge August 5, 2021 08:57 Inactive
@fw-bot fw-bot deleted the 14.0-12.0-fix-css-xdo-x1ds-fw branch August 19, 2021 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants