Merge branch 'admin-link' into 'develop'

Add Admin panel link to navigation for admins

See merge request pleroma/pleroma-fe!954

1 files changed, 9 insertions, 7 deletions

diff --git a/static/font/css/fontello.css b/static/font/css/fontello.css
index 653ada3c..a6b3c919 100644..100755
--- a/static/font/css/fontello.css
+++ b/static/font/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?94788965');
-  src: url('../font/fontello.eot?94788965#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?94788965') format('woff2'),
-       url('../font/fontello.woff?94788965') format('woff'),
-       url('../font/fontello.ttf?94788965') format('truetype'),
-       url('../font/fontello.svg?94788965#fontello') format('svg');
+  src: url('../font/fontello.eot?70867224');
+  src: url('../font/fontello.eot?70867224#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?70867224') format('woff2'),
+       url('../font/fontello.woff?70867224') format('woff'),
+       url('../font/fontello.ttf?70867224') format('truetype'),
+       url('../font/fontello.svg?70867224#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?94788965#fontello') format('svg');
+    src: url('../font/fontello.svg?70867224#fontello') format('svg');
   }
 }
 */
@@ -83,12 +83,14 @@
 .icon-pin:before { content: '\e819'; } /* '' */
 .icon-wrench:before { content: '\e81a'; } /* '' */
 .icon-chart-bar:before { content: '\e81b'; } /* '' */
+.icon-zoom-in:before { content: '\e81c'; } /* '' */
 .icon-spin3:before { content: '\e832'; } /* '' */
 .icon-spin4:before { content: '\e834'; } /* '' */
 .icon-link-ext:before { content: '\f08e'; } /* '' */
 .icon-link-ext-alt:before { content: '\f08f'; } /* '' */
 .icon-menu:before { content: '\f0c9'; } /* '' */
 .icon-mail-alt:before { content: '\f0e0'; } /* '' */
+.icon-gauge:before { content: '\f0e4'; } /* '' */
 .icon-comment-empty:before { content: '\f0e5'; } /* '' */
 .icon-bell-alt:before { content: '\f0f3'; } /* '' */
 .icon-plus-squared:before { content: '\f0fe'; } /* '' */