My attempt to cherry-pick things from #980 that work with current main#987
Closed
My attempt to cherry-pick things from #980 that work with current main#987
main#987Conversation
Signed-off-by: George Thomas <georgefsthomas@gmail.com>
Signed-off-by: George Thomas <georgefsthomas@gmail.com>
well, almost all - we still use black for Ann due to running out of good colours in our palette we try to colour type nodes analogously to corresponding term nodes - this makes more sense now that we use different shapes for terms and types this probably requires a little more thought e.g. we style term Lam and type LAM differently, choosing instead to highlight their analogies with TFun and TForall directly also, I personally think "blue-secondary" looks quite odd on the canvas, but it's fine for now since it's used for advanced features (polymorphism) we should also consider refactors to make this sort of change less laborious, though it's hard to say how to abstract colours properly when tailwind discourages concatenating class strings Signed-off-by: George Thomas <georgefsthomas@gmail.com> Signed-off-by: Drew Hess <src@drewhess.com>
we were already using `@` for two different concepts, so we may as well unify all three - we can now easily tell which sort of application is in use by the shape of children `$` is a weird Haskell-ism that isn't really used elsewhere Signed-off-by: George Thomas <georgefsthomas@gmail.com>
these seem redundant, since patterns already look so different to everthing else we may wish to re-introduce these in beginner mode Signed-off-by: George Thomas <georgefsthomas@gmail.com>
Member
Author
|
Honestly I think I would be happy to merge this to |
Contributor
|
Thanks! I briefly looked in to rebasing last night and the conflicts looked quite awkward. I've closed #980 since this is clearly an improvement, with nothing significant missing. |
split this for cleaner diffs (factor out tree lists, format, spaceTrees (lift to top-level?))? Signed-off-by: George Thomas <georgefsthomas@gmail.com>
Signed-off-by: George Thomas <georgefsthomas@gmail.com>
this get messed up while rebasing on #932 I'm not convince this is the right fix as I haven't looked in detail at those changes anyway, this should be squashed with the change which made type nodes rectangular Signed-off-by: George Thomas <georgefsthomas@gmail.com>
dhess
added
Deploy service
Contributor
|
Seeing as there's still a bit more cleanup that needs doing here, and this stuff was just lumped together for simplicity in the rush towards the demo, I'm going to split this in to separate PRs. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This is current
main, plus most of @georgefst's styling work from #980, which is based on a pretty out-of-datemaincommit that lacks several substantial improvements that I made tonight.FYI, I have skipped the following commits from #980:
main)All the rest were cherry-picked more or less cleanly into this PR.