Achieved
- Fixed bug where Resolve Conflict button wasn't disabled properly. (Desktop: Added enabled check before adding to NoteListContextMenu list. by Ahmad45123 · Pull Request #5270 · laurent22/joplin · GitHub)
- Progress in making the dialog have the same theme as Joplin.
Problems
I'm having trouble getting CodeMirror styling to match that of Joplins. I've been trying to copy from Joplins source code but it's still not working properly. I may reach for help if I find it taking way more time then needed.
Next week
- Continue work on styling.