libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #375 from 0ip/cssfix

Browse source 
No more inline CSS + added missing class for settings button
This commit is contained in:
John McLear 2012-01-29 08:39:29 -08:00
commit fdc44e65c8
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
static/css/pad.css
View file

@ -1068,6 +1068,9 @@ margin-top: 1px;
.buttonicon-clearauthorship { .buttonicon-clearauthorship {
background-position: 0px -86px; background-position: 0px -86px;
} }
.buttonicon-settings {
background-position: 0px -436px;
}
.buttonicon-import_export { .buttonicon-import_export {
background-position: 0px -68px; background-position: 0px -68px;
} }
@ -1079,9 +1082,11 @@ margin-top: 1px;
} }
.buttonicon-chat { .buttonicon-chat {
background-position: 0px -102px; background-position: 0px -102px;
display: inline-block;
} }
.buttonicon-showusers { .buttonicon-showusers {
background-position: 0px -183px; background-position: 0px -183px;
display: inline-block;
} }
#usericon #usericon
@ -1227,7 +1232,7 @@ label {
.popup { .popup {
font-size: 14px; font-size: 14px;
width: 400px; width: 450px;
z-index: 500; z-index: 500;
padding: 10px; padding: 10px;
border-radius: 6px; border-radius: 6px;
@ -1269,6 +1274,8 @@ label {
.right_popup { .right_popup {
float: left; float: left;
width: 50%;
box-sizing: border-box;
padding-left: 10px; padding-left: 10px;
} }
@ -1279,10 +1286,6 @@ label {
display: none; display: none;
} }
#settingsmenu .right_popup {
float:none;
}
.note { .note {
color: #ddd; color: #ddd;
font-size: 11px; font-size: 11px;

6
static/pad.html
View file

@ -33,7 +33,7 @@
</li> </li>
<li onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" > <li onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
<a title="Underline (ctrl-U)"> <a title="Underline (ctrl-U)">
<div class="buttonicon buttonicon-underline" style="margin-top:1px;"></div> <div class="buttonicon buttonicon-underline"></div>
</a> </a>
</li> </li>
<li onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;" > <li onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;" >
@ -104,7 +104,7 @@
</li> </li>
<li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" > <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" >
<a title="Show connected users"> <a title="Show connected users">
<div class="buttonicon buttonicon-showusers" id="usericonback" style="display:inline-block;"></div> <div class="buttonicon buttonicon-showusers" id="usericonback"></div>
<span id="online_count">1</span> <span id="online_count">1</span>
</a> </a>
</li> </li>
@ -228,7 +228,7 @@
<div id="chaticon"> <div id="chaticon">
<a onClick="chat.show();return false;" title="Open the chat for this pad"> <a onClick="chat.show();return false;" title="Open the chat for this pad">
<span id="chatlabel">Chat</span> <span id="chatlabel">Chat</span>
<div class="buttonicon buttonicon-chat" style="display:inline-block;"></div> <div class="buttonicon buttonicon-chat"></div>
</a> </a>
<span id="chatcounter">0</span> <span id="chatcounter">0</span>
</div> </div>