From 7fdda14cb8d915e8593e15be9fce87c8224ac531 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 08:07:20 -0800 Subject: [PATCH 1/7] Reposition Markdown formatting link There's probably a better way to do this. Feedback welcome. --- views/options/social/tavern.jade | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 46a773f8f4..0ac3286980 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -104,9 +104,10 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk include ./chat-box - small + small(style='position: relative; top: -130px; left: 26px; z-index: 10;') include ../../shared/formatting-help - alert.alert-info. - Note: if you're reporting a bug, the developers won't see it here. Please use Github instead. + small + alert.alert-info. + Note: if you're reporting a bug, the developers won't see it here. Please use Github instead. ul.unstyled.tavern-chat include ./chat-message From db7e582c95b1f96ebc6aaab0e79cb9c4a3dd288f Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 10:21:32 -0800 Subject: [PATCH 2/7] Re-modify position of markdown down formatting link I think this one makes more sense than previous PR and it also adjust spacing of Note. Still interested in feedback (would it make sense to add to docs.css and call a class or just do it inline? This is also first time, I've submitted a change to a pull request (and I'm not sure what's gonna happen). Hopefully github is smart and just modifies the previous commit (but we'll see). --- views/options/social/tavern.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 0ac3286980..93199a20bd 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -103,11 +103,11 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk - 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 use Github instead. + small(style='position: relative; top: 27px; left: -100px; z-index: 10;') + include ../../shared/formatting-help + include ./chat-box + small(style='position: relative; top: 58px; left: 0px') + alert.alert-info. + Note: if you're reporting a bug, the developers won't see it here. Please use Github instead. ul.unstyled.tavern-chat include ./chat-message From bb3f0ae7ecefb8c58bb87cbe73b3a34a86a476d9 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 12:07:23 -0800 Subject: [PATCH 3/7] Reposition markdown formatting link (3rd try) This replaces previous 2 commits. z-index has been removed. --- views/options/social/tavern.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 93199a20bd..1ebc4d601b 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -103,10 +103,10 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk - small(style='position: relative; top: 27px; left: -100px; z-index: 10;') - include ../../shared/formatting-help include ./chat-box - small(style='position: relative; top: 58px; left: 0px') + 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 use Github instead. ul.unstyled.tavern-chat From b1e5ee6433b854e34ba76cba808a2f9c52994f46 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 16:26:35 -0800 Subject: [PATCH 4/7] Revert "Reposition Markdown formatting link" This reverts commit 7fdda14cb8d915e8593e15be9fce87c8224ac531. Conflicts: views/options/social/tavern.jade --- views/options/social/tavern.jade | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 1ebc4d601b..d76326602a 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -103,11 +103,19 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk +<<<<<<< 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 use Github instead. +======= + 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 use Github instead. +>>>>>>> parent of 7fdda14... Reposition Markdown formatting link ul.unstyled.tavern-chat include ./chat-message From 0dd911f2bafca41bc808688897283e95177feef5 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 16:29:17 -0800 Subject: [PATCH 5/7] Revert "Re-modify position of markdown down formatting link" This reverts commit 7fdda14cb8d915e8593e15be9fce87c8224ac531. Conflicts: views/options/social/tavern.jade --- views/options/social/tavern.jade | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index d76326602a..c72717615d 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -103,6 +103,7 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk +<<<<<<< HEAD <<<<<<< HEAD include ./chat-box small(style='position: relative; top: -20px; left: 25px;') @@ -117,5 +118,13 @@ alert.alert-info. Note: if you're reporting a bug, the developers won't see it here. Please use Github instead. >>>>>>> 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 use Github instead. +>>>>>>> parent of db7e582... Re-modify position of markdown down formatting link ul.unstyled.tavern-chat include ./chat-message From 2905a2777ebe28041a0a0a6b1b6b147c225831b6 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 30 Nov 2013 16:37:04 -0800 Subject: [PATCH 6/7] Fix reposition of markdown formatting after 2 reverts What a mess, but I think it's oK now. Sorry. --- views/options/social/tavern.jade | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index c72717615d..1ebc4d601b 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -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 use Github instead. -======= - 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 use Github instead. ->>>>>>> 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 use Github instead. ->>>>>>> parent of db7e582... Re-modify position of markdown down formatting link ul.unstyled.tavern-chat include ./chat-message From 182a34ed7e57a1881cb8119686f9d3f67a0e4f12 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Sat, 14 Dec 2013 10:59:45 -0800 Subject: [PATCH 7/7] Update footer FAQ to wiki --- views/shared/footer.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/footer.jade b/views/shared/footer.jade index 68e7dc271f..a0e3277e57 100644 --- a/views/shared/footer.jade +++ b/views/shared/footer.jade @@ -23,7 +23,7 @@ footer.footer(ng-controller='FooterCtrl') li a(href='/static/extensions') Extensions li - a(href='/static/faq') FAQ + a(target='_blank', href='http://habitrpg.wikia.com/wiki/FAQ') FAQ li a(href='/static/privacy') Privacy li