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

Merge pull request #2707 from lpagliari/develop 

Fixing @font-face src path to be able to use font icons on plugins when minify is on
This commit is contained in:
John McLear 2015-06-24 18:49:33 +01:00
parent 04d5e25305 6ed85b8787
commit 444634b588
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/static/css/pad.css
View File

@ -189,7 +189,7 @@ a img {
left:0px;
right:250px;
}
.toolbar ul.menu_right {
right:0px;
}
@ -1029,7 +1029,7 @@ input[type=checkbox] {
left:0px;
right:100px;
}
.toolbar ul.menu_right {
right:0px;
}
@ -1091,7 +1091,7 @@ input[type=checkbox] {
background: none !important
}
li[data-key="showusers"] > a {
margin-top:-10px;
padding-top:2px !important;
line-height:20px;
@ -1248,11 +1248,11 @@ input[type=checkbox] {
@font-face {
font-family: "fontawesome-etherpad";
src:url("../font/fontawesome-etherpad.eot");
src:url("../font/fontawesome-etherpad.eot?#iefix") format("embedded-opentype"),
url("../font/fontawesome-etherpad.woff") format("woff"),
url("../font/fontawesome-etherpad.ttf") format("truetype"),
url("../font/fontawesome-etherpad.svg#fontawesome-etherpad") format("svg");
src:url("../../static/font/fontawesome-etherpad.eot");
src:url("../../static/font/fontawesome-etherpad.eot?#iefix") format("embedded-opentype"),
url("../../static/font/fontawesome-etherpad.woff") format("woff"),
url("../../static/font/fontawesome-etherpad.ttf") format("truetype"),
url("../../static/font/fontawesome-etherpad.svg#fontawesome-etherpad") format("svg");
font-weight: normal;
font-style: normal;