diff --git a/src/static/css/fontawesome-etherpad.css b/src/static/css/fontawesome-etherpad.css
index 13f28f2bf..f129e86d3 100644
--- a/src/static/css/fontawesome-etherpad.css
+++ b/src/static/css/fontawesome-etherpad.css
@@ -1,76 +1,208 @@
+@charset "UTF-8";
+
@font-face {
- font-family: 'fontawesome-etherpad';
- src: url('../font/fontawesome-etherpad.eot?81419457');
- src: url('../font/fontawesome-etherpad.eot?81419457#iefix') format('embedded-opentype'),
- url('../font/fontawesome-etherpad.woff?81419457') format('woff'),
- url('../font/fontawesome-etherpad.ttf?81419457') format('truetype'),
- url('../font/fontawesome-etherpad.svg?81419457#fontawesome-etherpad') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
- @font-face {
- font-family: 'fontawesome-etherpad';
- src: url('../font/fontawesome-etherpad.svg?81419457#fontawesome-etherpad') format('svg');
- }
-}
-*/
-
- [class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontawesome-etherpad";
- font-style: normal;
+ 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");
font-weight: normal;
- speak: none;
-
- display: inline-block;
- text-decoration: inherit;
- width: 1em;
- margin-right: .2em;
- text-align: center;
- /* opacity: .8; */
-
- /* For safety - reset parent styles, that can break glyph codes*/
- font-variant: normal;
- text-transform: none;
-
- /* fix buttons height, for twitter bootstrap */
- line-height: 1em;
-
- /* Animation center compensation - margins should be symmetric */
- /* remove if not needed */
- margin-left: .2em;
-
- /* you can be more comfortable with increased icons size */
- /* font-size: 120%; */
-
- /* Uncomment for 3D effect */
- /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+ font-style: normal;
+
+}
+
+[data-icon]:before {
+ font-family: "fontawesome-etherpad" !important;
+ content: attr(data-icon);
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
+ speak: none;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+ font-family: "fontawesome-etherpad" !important;
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
+ speak: none;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-clock:before {
+ content: "a";
+}
+.icon-mic-no:before {
+ content: "b";
+}
+.icon-text-height:before {
+ content: "c";
+}
+.icon-text-width:before {
+ content: "d";
+}
+.icon-talk-chat:before {
+ content: "e";
+}
+.icon-talk-chat-2:before {
+ content: "f";
+}
+.icon-video-camera:before {
+ content: "g";
+}
+.icon-user:before {
+ content: "h";
+}
+.icon-bold:before {
+ content: "i";
+}
+.icon-italic:before {
+ content: "j";
+}
+.icon-trash-bin:before {
+ content: "k";
+}
+.icon-strikethrough:before {
+ content: "l";
+}
+.icon-tachometer:before {
+ content: "m";
+}
+.icon-letter-mail:before {
+ content: "n";
+}
+.icon-font:before {
+ content: "o";
+}
+.icon-underline:before {
+ content: "p";
+}
+.icon-list:before {
+ content: "q";
+}
+.icon-list-number:before {
+ content: "r";
+}
+.icon-indent:before {
+ content: "s";
+}
+.icon-outdent:before {
+ content: "t";
+}
+.icon-undo:before {
+ content: "u";
+}
+.icon-spinner:before {
+ content: "v";
+}
+.icon-repeat-redo:before {
+ content: "w";
+}
+.icon-eye-slash-close:before {
+ content: "x";
+}
+.icon-volume-up:before {
+ content: "y";
+}
+.icon-paper-clip:before {
+ content: "z";
+}
+.icon-exchange:before {
+ content: "C";
+}
+.icon-cog-gear:before {
+ content: "D";
+}
+.icon-code:before {
+ content: "E";
+}
+.icon-play:before {
+ content: "F";
+}
+.icon-backward:before {
+ content: "G";
+}
+.icon-forward:before {
+ content: "H";
+}
+.icon-step-forward:before {
+ content: "I";
+}
+.icon-step-backward:before {
+ content: "J";
+}
+.icon-align-justify:before {
+ content: "A";
+}
+.icon-align-left:before {
+ content: "B";
+}
+.icon-align-right:before {
+ content: "K";
+}
+.icon-align-center:before {
+ content: "L";
+}
+.icon-subscript:before {
+ content: "M";
+}
+.icon-superscript:before {
+ content: "N";
+}
+.icon-file:before {
+ content: "O";
+}
+.icon-file-document:before {
+ content: "P";
+}
+.icon-file-text:before {
+ content: "Q";
+}
+.icon-files:before {
+ content: "R";
+}
+.icon-filmstrip:before {
+ content: "S";
+}
+.icon-folder2:before {
+ content: "T";
+}
+.icon-list-bullet:before {
+ content: "U";
+}
+.icon-pencil:before {
+ content: "V";
+}
+.icon-pause:before {
+ content: "W";
+}
+.icon-phone-mobile:before {
+ content: "X";
+}
+.icon-mic:before {
+ content: "Y";
+}
+.icon-camera:before {
+ content: "Z";
+}
+.icon-chat-bubble:before {
+ content: "0";
+}
+.icon-chat-bubble-two:before {
+ content: "1";
+}
+.icon-ptint:before {
+ content: "2";
+}
+.icon-group:before {
+ content: "3";
}
-
-.icon-users:before { content: '\e800'; } /* '' */
-.icon-star:before { content: '\e801'; } /* '' */
-.icon-cog:before { content: '\e802'; } /* '' */
-.icon-bold:before { content: '\e803'; } /* '' */
-.icon-italic:before { content: '\e804'; } /* '' */
-.icon-indent-left:before { content: '\e805'; } /* '' */
-.icon-indent-right:before { content: '\e806'; } /* '' */
-.icon-list-bullet:before { content: '\e807'; } /* '' */
-.icon-list-numbered:before { content: '\e808'; } /* '' */
-.icon-strike:before { content: '\e809'; } /* '' */
-.icon-underline:before { content: '\e80a'; } /* '' */
-.icon-cw:before { content: '\e80b'; } /* '' */
-.icon-ccw:before { content: '\e80c'; } /* '' */
-.icon-clock:before { content: '\e80d'; } /* '' */
-.icon-eye-off:before { content: '\e80e'; } /* '' */
-.icon-eye:before { content: '\e80f'; } /* '' */
-.icon-play:before { content: '\e810'; } /* '' */
-.icon-fast-bw:before { content: '\e811'; } /* '' */
-.icon-fast-fw:before { content: '\e812'; } /* '' */
-.icon-pause:before { content: '\e813'; } /* '' */
-.icon-glass:before { content: '\e814'; } /* '' */
-.icon-code:before { content: '\e815'; } /* '' */
-.icon-exchange:before { content: '\e816'; } /* '' */
-.icon-chat:before { content: '\e817'; } /* '' */
\ No newline at end of file
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 55a24733a..f97e1b3e1 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -611,28 +611,36 @@ table#otheruserstable {
margin-top: 4px;
background-repeat: no-repeat;
padding-left: 25px;
- background-image: url("../../static/img/etherpad_lite_icons.png");
color: #333;
text-decoration: none;
padding-bottom:2px;
+ display:inline;
+ padding-left:5px;
+ font-family: "Arial";
}
-#exporthtml {
- background-position: 0px -299px
+.exportlink{
+ font-family: "fontawesome-etherpad";
+ display:block;
+ margin:5px;
+ color:#666;
}
-#exportplain {
- background-position: 0px -395px
+#exporthtmla:before {
+ content: "\e826";
}
-#exportword {
- background-position: 0px -275px
+#exportplaina:before {
+ content: "\e802";
}
-#exportpdf {
- background-position: 0px -371px
+#exportworda:before {
+ content: "\e804";
}
-#exportopen {
- background-position: 0px -347px
+#exportpdfa:before {
+ content: "\e803";
}
-#exportdokuwiki {
- background-position: 0px -459px
+#exportopena:before {
+ content: "\e805";
+}
+#exportdokuwikia:before {
+ content: "\e805";
}
/* hidden element */
@@ -692,58 +700,58 @@ table#otheruserstable {
color: #666;
}
.buttonicon-bold:before {
- content: "\e803";
+ content: "\e81c";
}
.buttonicon-italic:before {
- content: "\e804";
+ content: "\e81d";
}
.buttonicon-underline:before {
- content: "\e80a";
-}
-.buttonicon-strikethrough:before {
- content: "\e809";
-}
-.buttonicon-insertorderedlist:before {
- content: "\e808";
-}
-.buttonicon-insertunorderedlist:before {
- content: "\e807";
-}
-.buttonicon-indent:before {
- content: "\e806";
-}
-.buttonicon-outdent:before {
- content: "\e805";
-}
-.buttonicon-undo:before {
- content: "\e80c";
-}
-.buttonicon-redo:before {
- content: "\e80b";
-}
-.buttonicon-clearauthorship:before {
- content: "\e80e";
-}
-.buttonicon-settings:before {
- content: "\e802";
-}
-.buttonicon-import_export:before {
- content: "\e816";
-}
-.buttonicon-embed:before {
- content: "\e815";
-}
-.buttonicon-history:before {
- content: "\e80d";
-}
-.buttonicon-chat:before {
content: "\e817";
}
+.buttonicon-strikethrough:before {
+ content: "\e818";
+}
+.buttonicon-insertorderedlist:before {
+ content: "\e816";
+}
+.buttonicon-insertunorderedlist:before {
+ content: "\e815";
+}
+.buttonicon-indent:before {
+ content: "\e814";
+}
+.buttonicon-outdent:before {
+ content: "\e813";
+}
+.buttonicon-undo:before {
+ content: "\e823";
+}
+.buttonicon-redo:before {
+ content: "\e824";
+}
+.buttonicon-clearauthorship:before {
+ content: "\e80d";
+}
+.buttonicon-settings:before {
+ content: "\e833";
+}
+.buttonicon-import_export:before {
+ content: "\e834";
+}
+.buttonicon-embed:before {
+ content: "\e827";
+}
+.buttonicon-history:before {
+ content: "\e837";
+}
+.buttonicon-chat:before {
+ content: "\e829";
+}
.buttonicon-showusers:before {
- content: "\e800";
+ content: "\e808";
}
.buttonicon-savedRevision:before {
- content: "\e801";
+ content: "\e835";
}
#focusprotector {
z-index: 100;
diff --git a/src/static/font/fontawesome-etherpad.eot b/src/static/font/fontawesome-etherpad.eot
index cc934ce67..fb6516862 100644
Binary files a/src/static/font/fontawesome-etherpad.eot and b/src/static/font/fontawesome-etherpad.eot differ
diff --git a/src/static/font/fontawesome-etherpad.svg b/src/static/font/fontawesome-etherpad.svg
index 11dfac76c..4033c4d16 100644
--- a/src/static/font/fontawesome-etherpad.svg
+++ b/src/static/font/fontawesome-etherpad.svg
@@ -1,66 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/font/fontawesome-etherpad.ttf b/src/static/font/fontawesome-etherpad.ttf
index bbfd72170..f2fe398ec 100644
Binary files a/src/static/font/fontawesome-etherpad.ttf and b/src/static/font/fontawesome-etherpad.ttf differ
diff --git a/src/static/font/fontawesome-etherpad.woff b/src/static/font/fontawesome-etherpad.woff
index 491fc5016..98de9c3e6 100644
Binary files a/src/static/font/fontawesome-etherpad.woff and b/src/static/font/fontawesome-etherpad.woff differ