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

Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite

This commit is contained in:
Peter 'Pita' Martischka 2011-08-17 19:58:37 +01:00
parent c8a0f946f2 58ea0d0ed3
commit b02ee510ac
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
static/css/pad.css
View File

@ -32,43 +32,40 @@ a img
padding-right: 3px; padding-right: 3px;
padding-left: 1px; padding-left: 1px;
z-index: 2; z-index: 2;
height: 31px;
overflow: hidden; overflow: hidden;
} }
#editbar #editbar
{ {
background-color: #F3F7F9; background: #f7f7f7;
width: 100%; background: -moz-linear-gradient(#f7f7f7, #f1f1f1 80%);
height: 31px; background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
padding-top: 4px; background: -o-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
height: 32px;
overflow: hidden; overflow: hidden;
padding-top: 3px;
width: 100%;
} }
#editbar ul li #editbar ul li
{ {
float: left; background: #fff;
margin-left: 2px; background: -moz-linear-gradient(#fff, #f0f0f0);
background-color: #fff; background: -ms-linear-gradient(#fff, #f0f0f0);
background: -o-linear-gradient(#fff, #f0f0f0);
-moz-border-radius: 4px; background: -webkit-linear-gradient(#fff, #f0f0f0);
border-radius: 4px;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 4px 5px; border-radius: 4px;
height: 18px;
width: 18px;
cursor: pointer; cursor: pointer;
float: left;
height: 18px;
margin-left: 2px;
overflow: hidden; overflow: hidden;
padding: 4px 5px;
background: white; /* fallback for older/unsupporting browsers */ width: 18px;
background: -moz-linear-gradient(top, #eee, white 20%, white 20%);
background: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), color-stop(20%, white), color-stop(20%, white));
} }
#editbar ul li a #editbar ul li a
@ -83,12 +80,22 @@ a img
top:-2px top:-2px
} }
#editbar ul li:hover #editbar ul li:hover {
{
border: 1px solid #888;
background: #fff; background: #fff;
} }
#editbar ul li:active {
background: #eee;
background: -moz-linear-gradient(#ddd, #fff);
background: -ms-linear-gradient(#ddd, #fff);
background: -o-linear-gradient(#ddd, #fff);
background: -webkit-linear-gradient(#ddd, #fff);
}
input[type="file"] {
color: #fff;
}
#editbar ul li.separator #editbar ul li.separator
{ {
border: inherit; border: inherit;
@ -312,7 +319,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
/* background: url(static/img/vdraggie.gif) no-repeat top center;*/ /* background: url(static/img/vdraggie.gif) no-repeat top center;*/
width:16px; width:16px;
height:16px; height:16px;
background-image:url('../../static/img/etherpad_lite_icons.gif'); background-image:url('../../static/img/etherpad_lite_icons.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 0px -300px; background-position: 0px -300px;
@ -779,7 +786,7 @@ ul#colorpickerswatches li:hover
width: 180px; width: 180px;
height: 200px; height: 200px;
z-index: 400; z-index: 400;
background-color:#f3f7f9; background-color:#f7f7f7;
border-left: 1px solid #999; border-left: 1px solid #999;
border-right: 1px solid #999; border-right: 1px solid #999;
border-top: 1px solid #999; border-top: 1px solid #999;
@ -1063,7 +1070,7 @@ opacity:.8;
.buttonicon{ .buttonicon{
width:16px; width:16px;
height:16px; height:16px;
background-image:url('../../static/img/etherpad_lite_icons.gif'); background-image:url('../../static/img/etherpad_lite_icons.png');
background-repeat: no-repeat; background-repeat: no-repeat;
margin-left: 1px; margin-left: 1px;
margin-top: 1px; margin-top: 1px;