mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge git://github.com/themasch/etherpad-lite into develop

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-26 19:06:45 +01:00
commit d23984f028
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
static/img/etherpad_lite_icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

4
static/js/pad_editbar.js
View file

@ -123,6 +123,10 @@ var padeditbar = (function()
{
padsavedrevs.saveNow();
}
else if (cmd == 'tglfont')
{
pad.changeViewOption('useMonospaceFont', !(pad.padOptions.view&&pad.padOptions.view.useMonospaceFont));
}
else
{
padeditor.ace.callWithAce(function(ace)

6
static/pad.html
View file

@ -76,6 +76,12 @@
<div class="buttonicon" style="background-position:0px -86px"></div>
</a>
</li>
<li class="separator"></li>
<li onClick="window.pad&&pad.editbarClick('tglfont');return false;" >
<a id="monospace" title="toggle the font between monospace and normal">
<div class="buttonicon" style="background-position:0px -436px"></div>
</a>
</li>
</ul>
<ul id="menu_right">