cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9101 from PJB3005/more-chat-fixes

Browse Source 
More chat fixes.
This commit is contained in:
clusterfack
2016-03-28 12:05:04 -05:00
parent a6ab7a7030 271278d8b7
commit c8dc57d090
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/client procs.dm
View File

@@ -76,6 +76,10 @@
if("vars") return view_var_Topic(href,href_list,hsrc)
if("chat") return chatOutput.Topic(href, href_list)
switch(href_list["action"])
if ("openLink")
src << link(href_list["link"])
..() //redirect to hsrc.Topic()
//testing("[usr] topic call took [(world.timeofday - timestart)/10] seconds")

4
goon/browserassets/css/browserOutput.css
View File

@@ -11,9 +11,9 @@ html, body {
}
body {
background: #fff;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 9pt;
line-height: 1.4;
line-height: 1.2;
overflow-x: hidden;
overflow-y: scroll;
word-wrap: break-word;

6
goon/browserassets/js/browserOutput.js
View File

@@ -771,12 +771,14 @@ $(function() {
if ($('.popup .changeFont').is(':visible')) {return;}
var popupContent = '<div class="head">Change Font</div>' +
'<div id="changeFont" class="changeFont">'+
'<a href="#" data-font="\'Helvetica Neue\', Helvetica, Arial" style="font-family: \'Helvetica Neue\', Helvetica, Arial;">Arial / Helvetica (Default)</a>'+
'<a href="#" data-font="Verdana" style="font-family: Verdana;">Verdana (Default)</a>'+
'<a href="#" data-font="\'Helvetica Neue\', Helvetica, Arial" style="font-family: \'Helvetica Neue\', Helvetica, Arial;">Arial / Helvetica</a>'+
'<a href="#" data-font="Times New Roman" style="font-family: Times New Roman;">Times New Roman</a>'+
'<a href="#" data-font="Georgia" style="font-family: Georgia;">Georgia</a>'+
'<a href="#" data-font="Verdana" style="font-family: Verdana;">Verdana</a>'+
'<a href="#" data-font="Courier New" style="font-family: Courier New;">Courier New</a>'+
'<a href="#" data-font="Lucida Console" style="font-family: Lucida Console;">Lucida Console</a>'+
'<a href="#" data-font="Wingdings" style="font-family: Wingdings;">Wingdings</a>'+
'<a href="#" data-font="Comic Sans MS" style="font-family: Comic Sans MS;">Comic Sans MS</a>'+
'</div>';
createPopup(popupContent, 200);
});

2
goon/code/datums/browserOutput.dm
View File

@@ -179,7 +179,7 @@ For the main html chat area
iconCache[iconKey] << icon
var/iconData = iconCache.ExportText(iconKey)
var/list/partial = text2list(iconData, "{")
return copytext(partial[2], 3, -5)
return replacetext(copytext(partial[2], 3, -5), "\n", "")
/proc/bicon(obj)