sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix reposition of markdown formatting after 2 reverts

Browse source 
What a mess, but I think it's oK now. Sorry.
This commit is contained in:
Bob Steffes 2013-11-30 16:37:04 -08:00
parent 0dd911f2ba
commit 2905a2777e
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
views/options/social/tavern.jade
View file

@ -103,28 +103,11 @@
.span8(ng-controller='ChatCtrl')
h3 Tavern Talk
<<<<<<< HEAD
<<<<<<< HEAD
include ./chat-box
small(style='position: relative; top: -20px; left: 25px;')
include ../../shared/formatting-help
small(style='position: relative; top: 18px; left: 0px')
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
=======
include ./chat-box
small
include ../../shared/formatting-help
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
>>>>>>> parent of 7fdda14... Reposition Markdown formatting link
=======
include ./chat-box
small(style='position: relative; top: -130px; left: 26px; z-index: 10;')
include ../../shared/formatting-help
small
alert.alert-info.
Note: if you're reporting a bug, the developers won't see it here. Please <a href='https://github.com/HabitRPG/habitrpg/issues' target='_blank'>use Github instead</a>.
>>>>>>> parent of db7e582... Re-modify position of markdown down formatting link
ul.unstyled.tavern-chat
include ./chat-message