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

Merge pull request #380 from jhollinger/master 

CSS bugfixes
This commit is contained in:
John McLear 2012-01-30 07:56:28 -08:00
parent aeea061f69 f69a2cca3c
commit cd36849dc3
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/css/pad.css
View File

@ -1276,7 +1276,6 @@ label {
float: left; float: left;
width: 50%; width: 50%;
box-sizing: border-box; box-sizing: border-box;
padding-left: 10px;
} }
#settingsmenu, #importexport, #embed { #settingsmenu, #importexport, #embed {

6
static/css/timeslider.css
View File

@ -195,10 +195,8 @@ float:right;
color: #222; color: #222;
} }
#importexport{ #importexport { top: 118px; }
top:103px; #importexport .popup { width: 185px; }
width:185px;
}
ul { margin-left: 1.5em; } ul { margin-left: 1.5em; }
ul ul { margin-left: 0 !important; } ul ul { margin-left: 0 !important; }

2
static/timeslider.html
View File

@ -188,7 +188,7 @@
<!-- export code --> <!-- export code -->
<div id="importexport"> <div id="importexport">
<div id="export"> <div id="export" class="popup">
Export current version as: Export current version as:
<a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a> <a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a>
<a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a> <a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a>