Less merge conflicts *hurray* :) #609
Merged
Conversation
This file contains 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
- remove base-url from inline-images. path is resolved by compass (images_dir) - commend out compass configs that get overwritten in gulpfile - update gulpfile to build into version tag folder - update paths in css and templates accordingly
- fix version tag placement in compass options
# Conflicts: # public/css/pathfinder.css # public/css/v1.3.4/pathfinder.css.map
|
Thanks for this! Code looks clean and well documented :) btw. feel free to join our Slack chat, it makes discussions easier. pathfinder@exodus4d.de |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Moved compiled css into a version tag folder - analog to structure of build js files. This should help decrease the likelihood of conflicts between forks and allows for a quick switch between different builds of the frondend code.
Would be greatly appreciated if you could integrated this :-)