From 97cd701fcb7a3a9db0b663e252661c1637b2cc08 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 16 Feb 2010 04:57:49 +0100 Subject: added lineheight to headlines, to have some spaces around --- etherpad/src/static/css/broadcast.css | 2 +- etherpad/src/static/css/pad2_ejs.css | 2 +- etherpad/src/static/js/ace.js | 4 ++-- infrastructure/ace/www/editor.css | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/etherpad/src/static/css/broadcast.css b/etherpad/src/static/css/broadcast.css index a746503..afb65b8 100644 --- a/etherpad/src/static/css/broadcast.css +++ b/etherpad/src/static/css/broadcast.css @@ -1,5 +1,5 @@ *,html.body { margin: 0; padding: 0; } -h1, h2, h3, h4, h5, h6 { display: inline; } +h1, h2, h3, h4, h5, h6 { display: inline; line-height: 2em; } .clear { clear: both; } diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index ee38441..253b8e2 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -1,7 +1,7 @@ *,html.body { margin: 0; padding: 0; } -h1, h2, h3, h4, h5, h6 { display: inline; } +h1, h2, h3, h4, h5, h6 { display: inline; line-height: 2em; } .clear { clear: both; } diff --git a/etherpad/src/static/js/ace.js b/etherpad/src/static/js/ace.js index 6d5bd49..6766cee 100644 --- a/etherpad/src/static/js/ace.js +++ b/etherpad/src/static/js/ace.js @@ -18,12 +18,12 @@ A.frame.style.height=(Q?Q+"px":R.style.height);A.ace_editorChangedSize();});B.se var L=function(Q){return'\''";};var G=function(Q){return'\'\\x3cscript type="text/javascript" src="'+Q+"\">\\x3c/script>'"; };var P=G;var O=L;B.destroy=C(function(){A.ace_dispose();A.frame.parentNode.removeChild(A.frame);delete F.registry[A.id]; A=null;});B.init=function(Q,S,R){B.importText(S);A.onEditorReady=function(){D=true;I();R();};(function(){var W=''; -var T=["'"+W+"'"];T.push(("('\\n\'');T.push('\' \''); var X='editorId = "'+A.id+'"; editorInfo = parent.'+K+'.registry[editorId]; window.onload = function() { window.onload = null; setTimeout(function() { var iframe = document.createElement("IFRAME"); iframe.scrolling = "no"; var outerdocbody = document.getElementById("outerdocbody"); iframe.frameBorder = 0; iframe.allowTransparency = true; outerdocbody.insertBefore(iframe, outerdocbody.firstChild); iframe.ace_outerWin = window; readyFunc = function() { editorInfo.onEditorReady(); readyFunc = null; editorInfo = null; }; var doc = iframe.contentWindow.document; doc.open(); doc.write('+T.join("+")+"); doc.close(); }, 0); }"; -var Y=[W,"",(''),'',"\x3cscript>",X,"\x3c/script>",'
x
']; +var Y=[W,"",(''),'',"\x3cscript>",X,"\x3c/script>",'
x
']; var U=document.createElement("IFRAME");U.frameBorder=0;A.frame=U;document.getElementById(Q).appendChild(U); var V=U.contentWindow.document;V.open();V.write(Y.join(""));V.close();B.adjustSize();})();};return B; } \ No newline at end of file diff --git a/infrastructure/ace/www/editor.css b/infrastructure/ace/www/editor.css index b15af14..9df127d 100644 --- a/infrastructure/ace/www/editor.css +++ b/infrastructure/ace/www/editor.css @@ -10,6 +10,7 @@ body { h1,h2,h3,h4,h5,h6 { display: inline; + line-height: 2em; } #outerdocbody { -- cgit v1.2.3-1-g7c22