summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-11-19 00:16:08 +0000
committerJohn McLear <john@mclear.co.uk>2014-11-19 00:16:08 +0000
commit9aea689438d364cfd89a476d06729b3dd1195b8e (patch)
treef9531be9b538728b88a83728edff7e610941ec0f /src
parente821cb13fa0707932e9ddd2844bc7be969cf9efe (diff)
downloadetherpad-lite-9aea689438d364cfd89a476d06729b3dd1195b8e.zip
move tiny bit of font awesome we actually use into pad.css
Diffstat (limited to 'src')
-rw-r--r--src/static/css/fontawesome-etherpad.css208
-rw-r--r--src/static/css/pad.css39
-rw-r--r--src/templates/pad.html1
3 files changed, 39 insertions, 209 deletions
diff --git a/src/static/css/fontawesome-etherpad.css b/src/static/css/fontawesome-etherpad.css
deleted file mode 100644
index f129e86d..00000000
--- a/src/static/css/fontawesome-etherpad.css
+++ /dev/null
@@ -1,208 +0,0 @@
-@charset "UTF-8";
-
-@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");
- font-weight: normal;
- 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";
-}
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index d30d3303..2d4080d1 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -1141,3 +1141,42 @@ input[type=checkbox] {
text-shadow: none;
}
/* End of gritter stuff */
+
+@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");
+ font-weight: normal;
+ 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;
+}
+
diff --git a/src/templates/pad.html b/src/templates/pad.html
index aba3f64f..b996ab6a 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -40,7 +40,6 @@
<link rel="shortcut icon" href="<%=settings.faviconPad%>">
<% e.begin_block("styles"); %>
- <link href="../static/css/fontawesome-etherpad.css" rel="stylesheet">
<link href="../static/css/pad.css" rel="stylesheet">
<link href="../static/custom/pad.css" rel="stylesheet">
<style title="dynamicsyntax"></style>