search

choyiny / afullstop

. <- this is a full stop, not a period
http://pages.choy.in/afullstop/?name=Github
MIT License
4 stars 9 forks source link

Added changes to dictionaryDefinition.html and included some css changes suggested by choyiny #15

Closed constantina-js closed 8 years ago

constantina-js commented 8 years ago

Preview can be found:

https://conscou.github.io/afullstop/pages/dictionaryDefinition.html

choyiny commented 8 years ago

To remove conflicting files you can just goto my fork and paste the original repo's code to your fork.

Also, I'm also looking into the code to see why it needs 2 clicks to show...

EDIT: How about trying this function instead (https://api.jquery.com/click/)

constantina-js commented 8 years ago

That's what I did for 404.html before I pushed :/

EDIT: redid copy/paste and when I tried to push it still told me that everything was up to date and nothing needed to be push

choyiny commented 8 years ago

Can you click "Use the command line" to merge the conflicts? I would love to merge the dictionary styled page but I can't without the conflicts being resolved first.

EDIT: I figured it out, it was merge conflict for README.md