[FW][FIX] makefile: fix overridden css #1089
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
Collaborator
Collaborator
Author
|
Ping @Xavier-Do, @AntoineVDV To merge the full chain, say
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
Collaborator
|
@fw-bot r+ |
robodoo
pushed a commit
that referenced
this pull request
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) closes #1089 X-original-commit: fd56d8c Signed-off-by: Antoine Vandevenne (anv) <AntoineVDV@users.noreply.github.com> Signed-off-by: Xavier Dollé (xdo) <xdo@odoo.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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