fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout

This commit is contained in:
Peter 'Pita' Martischka 2011-08-10 16:19:02 +01:00
parent 70f51ae660 143369b387
commit d66675914c
6 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
static/css/pad.css
View File

@ -308,7 +308,13 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
.hidesidebar #padeditor { right: 0; } .hidesidebar #padeditor { right: 0; }
#vdraggie { #vdraggie {
background: url(static/img/vdraggie.gif) no-repeat top center; /* background: url(static/img/vdraggie.gif) no-repeat top center;*/
width:16px;
height:16px;
background-image:url('../../static/img/etherpad_lite_icons.gif');
background-repeat: no-repeat;
background-position: 0px -300px;
cursor: W-resize; cursor: W-resize;
bottom:0; bottom:0;
position:absolute; position:absolute;
@ -906,19 +912,18 @@ position: relative;
display: block; display: block;
} }
/*
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable- autohide .ui-resizable-handle { display: none; }
*/
.ui-resizable-nw { .ui-resizable-nw {
width:16px;
height:16px;
background-image:url('../../static/img/etherpad_lite_icons.gif');
background-repeat: no-repeat;
background-position: 0px -455px;
cursor: nw-resize; cursor: nw-resize;
width: 22px; width: 22px;
height: 22px; height: 22px;
left: 0px; top: 0px; left: 2px; top: 1px;
background-size: 100% auto; background-size: 80% auto;
background-image: url("../img/nw-resize.png");
background-repeat: no-repeat;
/* background-position: -5px -5px;*/
} }
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right:
-5px; top: -5px;} -5px; top: -5px;}
@ -1046,3 +1051,10 @@ padding: 10px;
border-radius: 6px; border-radius: 6px;
opacity:.8; opacity:.8;
} }
.buttonicon{
width:16px;
height:16px;
background-image:url('../../static/img/etherpad_lite_icons.gif');
background-repeat: no-repeat;
}

BIN
static/img/etherpad_lite_icons.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
static/img/maximize_maximized.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 604 B

BIN
static/img/padtop5.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
static/img/padtopback2.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 372 B

72
static/pad.html
View File

@ -25,76 +25,75 @@
<ul id="menu_left"> <ul id="menu_left">
<li> <li>
<a onClick="window.pad&&pad.editbarClick('bold');return false" title="Bold (ctrl-B)"> <a onClick="window.pad&&pad.editbarClick('bold');return false" title="Bold (ctrl-B)">
<img src="../static/img/editbar_bold.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -116px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('italic'); return false;" title="Italics (ctrl-I)"> <a onClick="window.pad&&pad.editbarClick('italic'); return false;" title="Italics (ctrl-I)">
<img src="../static/img/editbar_italic.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px 0px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('underline');return false;" title="Underline (ctrl-U)"> <a onClick="window.pad&&pad.editbarClick('underline');return false;" title="Underline (ctrl-U)">
<img src="../static/img/editbar_underline.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -236px;margin-top:1px;"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('strikethrough');return false;" title="Strikethrough"> <a onClick="window.pad&&pad.editbarClick('strikethrough');return false;" title="Strikethrough">
<img src="../static/img/editbar_strikethrough.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -200px"></div>
</a> </a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;" title="Toggle Bullet List"> <a onClick="window.pad&&pad.editbarClick('insertunorderedlist');return false;" title="Toggle Bullet List">
<img src="../static/img/editbar_insertunorderedlist.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -34px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('indent');return false;" title="Indent List"> <a onClick="window.pad&&pad.editbarClick('indent');return false;" title="Indent List">
<img src="../static/img/editbar_indent.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -52px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('outdent');return false;" title="Unindent List"> <a onClick="window.pad&&pad.editbarClick('outdent');return false;" title="Unindent List">
<img src="../static/img/editbar_outdent.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -134px"></div>
</a> </a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('undo');return false;" title="Undo (ctrl-Z)"> <a onClick="window.pad&&pad.editbarClick('undo');return false;" title="Undo (ctrl-Z)">
<img src="../static/img/editbar_undo.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -255px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('redo');return false;" title="Redo (ctrl-Y)"> <a onClick="window.pad&&pad.editbarClick('redo');return false;" title="Redo (ctrl-Y)">
<img src="../static/img/editbar_redo.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -166px"></div>
</a> </a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" title="Clear Authorship Colors"> <a onClick="window.pad&&pad.editbarClick('clearauthorship');return false;" title="Clear Authorship Colors">
<img src="../static/img/editbar_clearauthorship.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -86px"></div>
</a> </a>
</li> </li>
</ul> </ul>
<ul id="menu_right"> <ul id="menu_right">
<li> <li>
<a id="readonlylink" onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad"> <a id="readonlylink" onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad">
<img src="../static/img/editbar_readonly.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -150px"></div>
</a> </a>
</li> </li>
<li> <li>
<a id="exportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;" <a id="exportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;" title="Import/Export from/to different document formats">
title="Import/Export from/to different document formats"> <div class="buttonicon" style="background-position:0px -68px"></div>
<img src="../static/img/editbar_import_export.gif" width="16" height="16" /> </a>
</a>
</li> </li>
<li> <li>
<a id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad"> <a id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad">
<img src="../static/img/editbar_embed.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -18px"></div>
</a> </a>
</li> </li>
<!-- <!--
We removed this feature cause its not worth the space it needs in the editbar We removed this feature cause its not worth the space it needs in the editbar
@ -109,23 +108,18 @@ We removed this feature cause its not worth the space it needs in the editbar
</select> </select>
</li>--> </li>-->
<li class="separator"></li> <li class="separator"></li>
<!--<li>
<a onClick="window.pad&&pad.editbarClick('chat'); return false;"
title="(Placeholder, not implemented so far) Open the chat for this pad">
<img src="../static/img/editbar_chat.gif" width="16" height="16" />
</a>
</li>-->
<li> <li>
<a id="timesliderlink" title="Show the history of this pad"> <a id="timesliderlink" title="Show the history of this pad">
<script> <script>
document.getElementById('timesliderlink').href = document.location+ '/timeslider'; document.getElementById('timesliderlink').href = document.location+ '/timeslider';
</script> </script>
<img src="../static/img/editbar_timeslider.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -218px"></div>
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users"> <a onClick="window.pad&&pad.editbarClick('showusers');return false;" title="Show connected users">
<img id="showusersicon" src="../static/img/editbar_showusers.gif" width="16" height="16" /> <span id="online_count">1</span> <div class="buttonicon" style="background-position:0px -184px;display:inline-block;"></div>
<span id="online_count">1</span>
</a> </a>
</li> </li>
</ul> </ul>
@ -256,7 +250,7 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
<a onClick="chat.show();return false;" <a onClick="chat.show();return false;"
title="Open the chat for this pad"> title="Open the chat for this pad">
<span id="chatlabel">Chat</span> <span id="chatlabel">Chat</span>
<img src="../static/img/editbar_chat.gif" width="16" height="16" /> <div class="buttonicon" style="background-position:0px -104px;display:inline-block;"></div>
</a> </a>
<span id="chatcounter">0</span> <span id="chatcounter">0</span>
</div> </div>