diff --git a/priv/static/index.html b/priv/static/index.html index bd66b3e12..e6bc4344a 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/font/.config.json.swp b/priv/static/static/font/.config.json.swp new file mode 100644 index 000000000..a8629d719 Binary files /dev/null and b/priv/static/static/font/.config.json.swp differ diff --git a/priv/static/static/font/config.json b/priv/static/static/font/config.json index 37adff798..fec1f9889 100644 --- a/priv/static/static/font/config.json +++ b/priv/static/static/font/config.json @@ -155,6 +155,30 @@ "css": "bell", "code": 59408, "src": "fontawesome" + }, + { + "uid": "ccc2329632396dc096bb638d4b46fb98", + "css": "mail-alt", + "code": 61664, + "src": "fontawesome" + }, + { + "uid": "c1f1975c885aa9f3dad7810c53b82074", + "css": "lock", + "code": 59409, + "src": "fontawesome" + }, + { + "uid": "05376be04a27d5a46e855a233d6e8508", + "css": "lock-open-alt", + "code": 61758, + "src": "fontawesome" + }, + { + "uid": "197375a3cea8cb90b02d06e4ddf1433d", + "css": "globe", + "code": 59410, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/priv/static/static/font/css/fontello-codes.css b/priv/static/static/font/css/fontello-codes.css index e4e4e64df..b94470914 100644 Binary files a/priv/static/static/font/css/fontello-codes.css and b/priv/static/static/font/css/fontello-codes.css differ diff --git a/priv/static/static/font/css/fontello-embedded.css b/priv/static/static/font/css/fontello-embedded.css index 20e498fe7..deee4990d 100644 Binary files a/priv/static/static/font/css/fontello-embedded.css and b/priv/static/static/font/css/fontello-embedded.css differ diff --git a/priv/static/static/font/css/fontello-ie7-codes.css b/priv/static/static/font/css/fontello-ie7-codes.css index d7a5a5232..ad83b705f 100644 Binary files a/priv/static/static/font/css/fontello-ie7-codes.css and b/priv/static/static/font/css/fontello-ie7-codes.css differ diff --git a/priv/static/static/font/css/fontello-ie7.css b/priv/static/static/font/css/fontello-ie7.css index 5ca12ceaf..1aa9f5c2e 100644 Binary files a/priv/static/static/font/css/fontello-ie7.css and b/priv/static/static/font/css/fontello-ie7.css differ diff --git a/priv/static/static/font/css/fontello.css b/priv/static/static/font/css/fontello.css index 5cc6f97d7..0bb5eb926 100644 Binary files a/priv/static/static/font/css/fontello.css and b/priv/static/static/font/css/fontello.css differ diff --git a/priv/static/static/font/demo.html b/priv/static/static/font/demo.html index d01bd1d65..801480226 100644 --- a/priv/static/static/font/demo.html +++ b/priv/static/static/font/demo.html @@ -229,11 +229,11 @@ body { } @font-face { font-family: 'fontello'; - src: url('./font/fontello.eot?34497073'); - src: url('./font/fontello.eot?34497073#iefix') format('embedded-opentype'), - url('./font/fontello.woff?34497073') format('woff'), - url('./font/fontello.ttf?34497073') format('truetype'), - url('./font/fontello.svg?34497073#fontello') format('svg'); + src: url('./font/fontello.eot?48963108'); + src: url('./font/fontello.eot?48963108#iefix') format('embedded-opentype'), + url('./font/fontello.woff?48963108') format('woff'), + url('./font/fontello.ttf?48963108') format('truetype'), + url('./font/fontello.svg?48963108#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -323,14 +323,20 @@ body {
icon-bell0xe810
+
icon-lock0xe811
+
icon-globe0xe812
icon-spin30xe832
-
icon-spin40xe834
-
icon-link-ext0xf08e
+
icon-spin40xe834
+
icon-link-ext0xf08e
icon-menu0xf0c9
+
icon-mail-alt0xf0e0
+
+
icon-comment-empty0xf0e5
icon-reply0xf112
+
icon-lock-open-alt0xf13e
icon-binoculars0xf1e5
diff --git a/priv/static/static/font/font/fontello.eot b/priv/static/static/font/font/fontello.eot index d15e83911..aa6bb542d 100644 Binary files a/priv/static/static/font/font/fontello.eot and b/priv/static/static/font/font/fontello.eot differ diff --git a/priv/static/static/font/font/fontello.svg b/priv/static/static/font/font/fontello.svg index be07ddae3..0862d2773 100644 --- a/priv/static/static/font/font/fontello.svg +++ b/priv/static/static/font/font/fontello.svg @@ -40,6 +40,10 @@ + + + + @@ -48,10 +52,14 @@ + + + + diff --git a/priv/static/static/font/font/fontello.ttf b/priv/static/static/font/font/fontello.ttf index 3b08e96b8..c9a50e1a5 100644 Binary files a/priv/static/static/font/font/fontello.ttf and b/priv/static/static/font/font/fontello.ttf differ diff --git a/priv/static/static/font/font/fontello.woff b/priv/static/static/font/font/fontello.woff index 167d132db..5accf9073 100644 Binary files a/priv/static/static/font/font/fontello.woff and b/priv/static/static/font/font/fontello.woff differ diff --git a/priv/static/static/font/font/fontello.woff2 b/priv/static/static/font/font/fontello.woff2 index 224e9b97b..1cdb8a640 100644 Binary files a/priv/static/static/font/font/fontello.woff2 and b/priv/static/static/font/font/fontello.woff2 differ diff --git a/priv/static/static/fontold/LICENSE.txt b/priv/static/static/fontold/LICENSE.txt new file mode 100644 index 000000000..c26be3848 --- /dev/null +++ b/priv/static/static/fontold/LICENSE.txt @@ -0,0 +1,30 @@ +Font license info + + +## Font Awesome + + Copyright (C) 2016 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + +## Entypo + + Copyright (C) 2012 by Daniel Bruce + + Author: Daniel Bruce + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://www.entypo.com + + +## Fontelico + + Copyright (C) 2012 by Fontello project + + Author: Crowdsourced, for Fontello project + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://fontello.com + + diff --git a/priv/static/static/fontold/README.txt b/priv/static/static/fontold/README.txt new file mode 100644 index 000000000..beaab3366 --- /dev/null +++ b/priv/static/static/fontold/README.txt @@ -0,0 +1,75 @@ +This webfont is generated by http://fontello.com open source project. + + +================================================================================ +Please, note, that you should obey original font licenses, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publicly available in your repository. + +- Fonts, used in Fontello, don't require a clickable link on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on archive content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enough, it contains @font-face + and character code definitions + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + + + + + + +
+

fontello font demo

+ +
+
+
+
icon-cancel0xe800
+
icon-upload0xe801
+
icon-star0xe802
+
icon-star-empty0xe803
+
+
+
icon-retweet0xe804
+
icon-eye-off0xe805
+
icon-plus-squared0xe806
+
icon-cog0xe807
+
+
+
icon-logout0xe808
+
icon-down-open0xe809
+
icon-attach0xe80a
+
icon-picture0xe80b
+
+
+
icon-video0xe80c
+
icon-right-open0xe80d
+
icon-left-open0xe80e
+
icon-up-open0xe80f
+
+
+
icon-bell0xe810
+
icon-spin30xe832
+
icon-spin40xe834
+
icon-link-ext0xf08e
+
+
+
icon-menu0xf0c9
+
icon-comment-empty0xf0e5
+
icon-reply0xf112
+
icon-binoculars0xf1e5
+
+
+
icon-user-plus0xf234
+
+
+ + + \ No newline at end of file diff --git a/priv/static/static/fontold/font/fontello.eot b/priv/static/static/fontold/font/fontello.eot new file mode 100644 index 000000000..d15e83911 Binary files /dev/null and b/priv/static/static/fontold/font/fontello.eot differ diff --git a/priv/static/static/fontold/font/fontello.svg b/priv/static/static/fontold/font/fontello.svg new file mode 100644 index 000000000..be07ddae3 --- /dev/null +++ b/priv/static/static/fontold/font/fontello.svg @@ -0,0 +1,60 @@ + + + +Copyright (C) 2018 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/priv/static/static/fontold/font/fontello.ttf b/priv/static/static/fontold/font/fontello.ttf new file mode 100644 index 000000000..3b08e96b8 Binary files /dev/null and b/priv/static/static/fontold/font/fontello.ttf differ diff --git a/priv/static/static/fontold/font/fontello.woff b/priv/static/static/fontold/font/fontello.woff new file mode 100644 index 000000000..167d132db Binary files /dev/null and b/priv/static/static/fontold/font/fontello.woff differ diff --git a/priv/static/static/fontold/font/fontello.woff2 b/priv/static/static/fontold/font/fontello.woff2 new file mode 100644 index 000000000..224e9b97b Binary files /dev/null and b/priv/static/static/fontold/font/fontello.woff2 differ diff --git a/priv/static/static/js/app.bc857af2351209fae8b1.js b/priv/static/static/js/app.029b23b3921537271958.js similarity index 55% rename from priv/static/static/js/app.bc857af2351209fae8b1.js rename to priv/static/static/js/app.029b23b3921537271958.js index eabf981be..afaffa4c7 100644 Binary files a/priv/static/static/js/app.bc857af2351209fae8b1.js and b/priv/static/static/js/app.029b23b3921537271958.js differ diff --git a/priv/static/static/js/app.029b23b3921537271958.js.map b/priv/static/static/js/app.029b23b3921537271958.js.map new file mode 100644 index 000000000..00877260f Binary files /dev/null and b/priv/static/static/js/app.029b23b3921537271958.js.map differ diff --git a/priv/static/static/js/app.bc857af2351209fae8b1.js.map b/priv/static/static/js/app.bc857af2351209fae8b1.js.map deleted file mode 100644 index 3080bd5fa..000000000 Binary files a/priv/static/static/js/app.bc857af2351209fae8b1.js.map and /dev/null differ diff --git a/priv/static/static/js/manifest.0c6e27fdd357bf57496d.js b/priv/static/static/js/manifest.0c6e27fdd357bf57496d.js deleted file mode 100644 index 2fc50f5cc..000000000 Binary files a/priv/static/static/js/manifest.0c6e27fdd357bf57496d.js and /dev/null differ diff --git a/priv/static/static/js/manifest.f40706e221610d4c6256.js b/priv/static/static/js/manifest.f40706e221610d4c6256.js new file mode 100644 index 000000000..8ea08b5d7 Binary files /dev/null and b/priv/static/static/js/manifest.f40706e221610d4c6256.js differ diff --git a/priv/static/static/js/manifest.0c6e27fdd357bf57496d.js.map b/priv/static/static/js/manifest.f40706e221610d4c6256.js.map similarity index 93% rename from priv/static/static/js/manifest.0c6e27fdd357bf57496d.js.map rename to priv/static/static/js/manifest.f40706e221610d4c6256.js.map index 0c8850d50..90a232a1e 100644 Binary files a/priv/static/static/js/manifest.0c6e27fdd357bf57496d.js.map and b/priv/static/static/js/manifest.f40706e221610d4c6256.js.map differ diff --git a/priv/static/static/temp/fontello-a9f33f16.zip b/priv/static/static/temp/fontello-a9f33f16.zip new file mode 100644 index 000000000..1ae387fe5 Binary files /dev/null and b/priv/static/static/temp/fontello-a9f33f16.zip differ