-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
SVG Update: Add 3 Jacks and Optimize 1 Example #2980
Conversation
Update my Fork
As discussed in issue TiddlyWiki#2690
As discussed in issue TiddlyWiki#2690
Updating my fork
Update my copy of TiddlyWiki
CamelCase words are NOT joined with hyphens (copy-paste error?). Copied "directly" from the line below to make the meaning even clearer.
Update my fork after conflict is resolved
- show a highlight using a longer timespan (180 days) - added a second highlight to demo timespan with start AND end in the past - better readability
- typo - readability (explain { positive | negative } first; remove duplication)
Update my fork
When the save button was not the last edit button (tested by moving to another place via control panel > Appearance > Toolbars > Edit Toolbar by drag-and-drop) then we got additional spacing due to whitespace in the resulting HTML after the button. This is a fix for that, I discovered while developing additional edit buttons.
A tiny cat.
Another tiny cat.
Using SVG: Use .svg in example instead of .jpg Add ReadyJack, AnxiousJack and SleepyJack illustrations
Update my fork from Jermolene
The three new files look good. the four changed files look good. Not sure why there are 27 commits for this? Also if the SVGs are in their own file with a meta file then GitHub will render the images. Would you like me to make a PR that doesn't have so many commits? |
I have rebased the changes in PR #2981 This PR can be closed!! |
If anyone is interested.
Each time the patch failed (due because the code changes were already in master from previous pull requests) I performed Eventually the whole thing applied. I looked at each commit and mentally remembered their grouping. I then ran
I then added the final commit to move meta data to separate files so GitHub could display the SVG changes correctly. |
Thank you @sukima for cleaning up! I guess the whole mess comes from my exclusive use of github in the browser. (No git client or command line in use at the moment. I am only an amateur who likes to dedicate some time to this great tool.) Maybe I will have to learn git in the future … |
I had always thought GitHub allowed you to create a branch when you make edits. That fixes up most of this. There is also a GitHub desktop client that does wonders. |
Yep, I had a branch at some time – but then again it was not in sync with Jermolene/master so the only way I could see was to update my master, merge my branch and start the PR from there. Obviously not ideal. Thanks anyway! |
Yet another nail in the GitHub coffin. I really wish GitHub offered better tools on their web site. |
Using SVG: Use .svg in example instead of .jpg
Add ReadyJack, AnxiousJack and SleepyJack illustrations
The new cats should look like this: https://tid.li/tw5/hacks.html#SleepyJack.svg:SleepyJack.svg%20ReadyJack.svg%20AnxiousJack.svg